matt feedback

man/man8/zfs-wait.8

@@ -49,7 +49,7 @@
 Waits until all background activity of the given types has ceased in the given
 filesystem.
 The activity could cease because it has completed or because the filesystem has
-been destroyed.
+been destroyed or unmounted.
 If no activities are specified, the command waits until background activity of
 every type listed below has ceased.
 If there is no activity of the given types in progress, the command returns

module/zfs/dsl_dataset.c

@@ -3235,8 +3235,6 @@ dsl_dataset_rollback_sync(void *arg, dmu_tx_t *tx)
 
 	VERIFY0(dsl_dataset_hold(dp, ddra->ddra_fsname, FTAG, &ds));
 
-	dsl_dir_cancel_waiters(ds->ds_dir);
-
 	dsl_dataset_name(ds->ds_prev, namebuf);
 	fnvlist_add_string(ddra->ddra_result, "target", namebuf);
 

module/zfs/dsl_destroy.c

@@ -763,14 +763,11 @@ dsl_destroy_head_check_impl(dsl_dataset_t *ds, int expected_holds)
 	if (ds->ds_is_snapshot)
 		return (SET_ERROR(EINVAL));
 
-	dsl_dir_t *dd = ds->ds_dir;
-	mutex_enter(&dd->dd_activity_lock);
-	if (zfs_refcount_count(&ds->ds_longholds) != expected_holds +
-	    dd->dd_activity_count) {
-		mutex_exit(&dd->dd_activity_lock);
+	if (zfs_refcount_count(&ds->ds_longholds) != expected_holds)
 		return (SET_ERROR(EBUSY));
-	}
-	mutex_exit(&dd->dd_activity_lock);
+
+	ASSERT0(ds->ds_dir->dd_activity_count);
+	mutex_exit(&ds->ds_dir->dd_activity_lock);
 
 	mos = ds->ds_dir->dd_pool->dp_meta_objset;
 

module/zfs/dsl_dir.c

@@ -2310,6 +2310,7 @@ dsl_dir_activity_in_progress(dsl_dir_t *dd, dsl_dataset_t *ds,
 			break;
 
 		if (dmu_objset_type(os) != DMU_OST_ZFS ||
+		    dmu_objset_get_user(os) == NULL || 
 		    zfs_get_vfs_flag_unmounted(os)) {
 			*in_progress = B_FALSE;
 			return (0);
@@ -2392,5 +2393,4 @@ dsl_dir_cancel_waiters(dsl_dir_t *dd)
 #if defined(_KERNEL)
 EXPORT_SYMBOL(dsl_dir_set_quota);
 EXPORT_SYMBOL(dsl_dir_set_reservation);
-EXPORT_SYMBOL(dsl_dir_cancel_waiters);
 #endif

module/zfs/zfs_ioctl.c

@@ -4126,17 +4126,12 @@ zfs_ioc_wait_fs(const char *name, nvlist_t *innvl, nvlist_t *outnvl)
 	if ((error = dsl_pool_hold(name, FTAG, &dp)) != 0)
 		return (error);
 
-	if ((error = dsl_dir_hold(dp, name, FTAG, &dd, NULL)) != 0) {
+	if ((error = dsl_dataset_hold(dp, name, FTAG, &ds)) != 0) {
 		dsl_pool_rele(dp, FTAG);
 		return (error);
 	}
 
-	if ((error = dsl_dataset_hold_obj(dd->dd_pool,
-	    dsl_dir_phys(dd)->dd_head_dataset_obj, FTAG, &ds)) != 0) {
-		dsl_pool_rele(dp, FTAG);
-		dsl_dir_rele(dd, FTAG);
-		return (error);
-	}
+	dd = ds->ds_dir;
 	mutex_enter(&dd->dd_activity_lock);
 	dd->dd_activity_count++;