diff options
| author | George Melikov <mail@gmelikov.ru> | 2017-01-23 18:53:46 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2017-01-23 18:53:46 +0000 |
| commit | ec923db25c823dd460fdb5db44a5a202a0975f27 (patch) | |
| tree | 16fde8482af6d62f45c97586aab2b9ed42b5dbc3 /module/zfs/zfs_ioctl.c | |
| parent | cffd6e116711640d070d9690480b95c5a6de7154 (diff) | |
| download | src-ec923db25c823dd460fdb5db44a5a202a0975f27.tar.gz src-ec923db25c823dd460fdb5db44a5a202a0975f27.zip | |
OpenZFS 7180 - potential race between zfs_suspend_fs+zfs_resume_fs and zfs_ioc_rename
Authored by: Andriy Gapon <andriy.gapon@clusterhq.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/7180
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/690041b
Closes #5627
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 659345917f8c..8ae4300f5d88 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -3645,12 +3645,15 @@ zfs_ioc_rollback(const char *fsname, nvlist_t *args, nvlist_t *outnvl) int error; if (get_zfs_sb(fsname, &zsb) == 0) { + dsl_dataset_t *ds; + + ds = dmu_objset_ds(zsb->z_os); error = zfs_suspend_fs(zsb); if (error == 0) { int resume_err; error = dsl_dataset_rollback(fsname, zsb, outnvl); - resume_err = zfs_resume_fs(zsb, fsname); + resume_err = zfs_resume_fs(zsb, ds); error = error ? error : resume_err; } deactivate_super(zsb->z_sb); @@ -4248,8 +4251,10 @@ zfs_ioc_recv_impl(char *tofs, char *tosnap, char *origin, if (get_zfs_sb(tofs, &zsb) == 0) { /* online recv */ + dsl_dataset_t *ds; int end_err; + ds = dmu_objset_ds(zsb->z_os); error = zfs_suspend_fs(zsb); /* * If the suspend fails, then the recv_end will @@ -4257,7 +4262,7 @@ zfs_ioc_recv_impl(char *tofs, char *tosnap, char *origin, */ end_err = dmu_recv_end(&drc, zsb); if (error == 0) - error = zfs_resume_fs(zsb, tofs); + error = zfs_resume_fs(zsb, ds); error = error ? error : end_err; deactivate_super(zsb->z_sb); } else if ((zv = zvol_suspend(tofs)) != NULL) { @@ -4944,11 +4949,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; + + ds = dmu_objset_ds(zsb->z_os); error = zfs_suspend_fs(zsb); if (error == 0) { dmu_objset_refresh_ownership(zsb->z_os, zsb); - error = zfs_resume_fs(zsb, zc->zc_name); + error = zfs_resume_fs(zsb, ds); } } if (error == 0) |