Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
commit
191383545e
|
@ -94,5 +94,6 @@ AC_CONFIG_FILES([
|
||||||
module/zcommon/include/sys/fm/fs/Makefile
|
module/zcommon/include/sys/fm/fs/Makefile
|
||||||
module/zfs/Makefile
|
module/zfs/Makefile
|
||||||
module/zpios/Makefile
|
module/zpios/Makefile
|
||||||
|
module/zpios/include/Makefile
|
||||||
])
|
])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -176,7 +176,7 @@ kpios_dmu_setup(run_args_t *run_args)
|
||||||
|
|
||||||
t->start = current_kernel_time();
|
t->start = current_kernel_time();
|
||||||
|
|
||||||
rc = dmu_objset_open(run_args->pool, DMU_OST_ZFS, DS_MODE_STANDARD, &os);
|
rc = dmu_objset_open(run_args->pool, DMU_OST_ZFS, DS_MODE_USER, &os);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
kpios_print(run_args->file, "Error dmu_objset_open() "
|
kpios_print(run_args->file, "Error dmu_objset_open() "
|
||||||
"failed: %d\n", rc);
|
"failed: %d\n", rc);
|
||||||
|
|
Loading…
Reference in New Issue