From 5e00213e430fe9103e263514490d55d10075908e Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Wed, 21 Feb 2018 14:55:55 +0200 Subject: OpenZFS 9164 - assert: newds == os->os_dsl_dataset Authored by: Andriy Gapon Reviewed by: Matt Ahrens Reviewed by: Don Brady Reviewed-by: loli10K Reviewed-by: Tony Hutter Reviewed-by: Brian Behlendorf Approved by: Richard Lowe Ported-by: Giuseppe Di Natale Porting Notes: * Re-enabled and tweaked the zpool_upgrade_007_pos test case to successfully run in under 5 minutes. OpenZFS-issue: https://www.illumos.org/issues/9164 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/0e776dc06a Closes #6112 Closes #7336 --- module/zfs/zfs_ioctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/zfs/zfs_ioctl.c') diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 92bdec4b9..8ef4cc46f 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -5290,14 +5290,14 @@ zfs_ioc_userspace_upgrade(zfs_cmd_t *zc) * objset needs to be closed & reopened (to grow the * objset_phys_t). Suspend/resume the fs will do that. */ - dsl_dataset_t *ds; + dsl_dataset_t *ds, *newds; ds = dmu_objset_ds(zfsvfs->z_os); error = zfs_suspend_fs(zfsvfs); if (error == 0) { - dmu_objset_refresh_ownership(zfsvfs->z_os, + dmu_objset_refresh_ownership(ds, &newds, B_TRUE, zfsvfs); - error = zfs_resume_fs(zfsvfs, ds); + error = zfs_resume_fs(zfsvfs, newds); } } if (error == 0) -- cgit v1.2.3