mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Fix ZFS deadlock when sending a snapshot which is mounted.

Browse Source 
MFC after:	1 week
Sponsored by:	Multiplay
This commit is contained in:
Steven Hartland 2013-11-18 11:28:19 +00:00
parent dd580326fe
commit 8dfd07b976
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=258294
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
View File

@ -564,21 +564,23 @@ dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
ddura.ddura_holdfunc = dsl_dataset_hold_obj_string; ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
pool = spa_name(tmpdp->dp_spa); pool = spa_name(tmpdp->dp_spa);
#ifdef _KERNEL #ifdef _KERNEL
dsl_pool_config_enter(tmpdp, FTAG);
for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL; for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
pair = nvlist_next_nvpair(holds, pair)) { pair = nvlist_next_nvpair(holds, pair)) {
dsl_dataset_t *ds; dsl_dataset_t *ds;
dsl_pool_config_enter(tmpdp, FTAG);
error = dsl_dataset_hold_obj_string(tmpdp, error = dsl_dataset_hold_obj_string(tmpdp,
nvpair_name(pair), FTAG, &ds); nvpair_name(pair), FTAG, &ds);
if (error == 0) { if (error == 0) {
char name[MAXNAMELEN]; char name[MAXNAMELEN];
dsl_dataset_name(ds, name); dsl_dataset_name(ds, name);
dsl_pool_config_exit(tmpdp, FTAG);
dsl_dataset_rele(ds, FTAG); dsl_dataset_rele(ds, FTAG);
(void) zfs_unmount_snap(name); (void) zfs_unmount_snap(name);
} else {
dsl_pool_config_exit(tmpdp, FTAG);
} }
} }
dsl_pool_config_exit(tmpdp, FTAG);
#endif #endif
} else { } else {
/* Non-temporary holds are specified by name. */ /* Non-temporary holds are specified by name. */