Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-06 12:36:32 -08:00
commit 33db1a5b9a
2 changed files with 2 additions and 1 deletions

View File

@ -94,5 +94,6 @@ AC_CONFIG_FILES([
module/zcommon/include/sys/fm/fs/Makefile
module/zfs/Makefile
module/zpios/Makefile
module/zpios/include/Makefile
])
AC_OUTPUT

View File

@ -176,7 +176,7 @@ kpios_dmu_setup(run_args_t *run_args)
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) {
kpios_print(run_args->file, "Error dmu_objset_open() "
"failed: %d\n", rc);