Skip to content

Commit 8e7307d

Browse files
committed
fix test bug
1 parent 2caba5e commit 8e7307d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

module/zfs/dsl_dir.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,9 +2309,11 @@ dsl_dir_activity_in_progress(dsl_dir_t *dd, dsl_dataset_t *ds,
23092309
if (error != 0)
23102310
break;
23112311

2312+
mutex_enter(&os->os_user_ptr_lock);
2313+
void *user = dmu_objset_get_user(os);
2314+
mutex_exit(&os->os_user_ptr_lock);
23122315
if (dmu_objset_type(os) != DMU_OST_ZFS ||
2313-
dmu_objset_get_user(os) == NULL ||
2314-
zfs_get_vfs_flag_unmounted(os)) {
2316+
user == NULL || zfs_get_vfs_flag_unmounted(os)) {
23152317
*in_progress = B_FALSE;
23162318
return (0);
23172319
}

module/zfs/zfs_ioctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4132,7 +4132,6 @@ zfs_ioc_wait_fs(const char *name, nvlist_t *innvl, nvlist_t *outnvl)
41324132
mutex_exit(&dd->dd_activity_lock);
41334133

41344134
dsl_dataset_rele(ds, FTAG);
4135-
dsl_dir_rele(dd, FTAG);
41364135

41374136
if (error == 0)
41384137
fnvlist_add_boolean_value(outnvl, ZFS_WAIT_WAITED, waited);

0 commit comments

Comments
 (0)