svn commit: r258595 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Steven Hartland
smh at FreeBSD.org
Mon Nov 25 20:47:38 UTC 2013
Author: smh
Date: Mon Nov 25 20:47:37 2013
New Revision: 258595
URL: http://svnweb.freebsd.org/changeset/base/258595
Log:
MFC r258294:
Fix ZFS deadlock when sending a snapshot which is mounted.
Approved by: re (glebius)
Sponsored by: Multiplay
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
Directory Properties:
stable/10/sys/ (props changed)
stable/10/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c Mon Nov 25 20:45:30 2013 (r258594)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c Mon Nov 25 20:47:37 2013 (r258595)
@@ -564,21 +564,23 @@ dsl_dataset_user_release_impl(nvlist_t *
ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
pool = spa_name(tmpdp->dp_spa);
#ifdef _KERNEL
- dsl_pool_config_enter(tmpdp, FTAG);
for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
pair = nvlist_next_nvpair(holds, pair)) {
dsl_dataset_t *ds;
+ dsl_pool_config_enter(tmpdp, FTAG);
error = dsl_dataset_hold_obj_string(tmpdp,
nvpair_name(pair), FTAG, &ds);
if (error == 0) {
char name[MAXNAMELEN];
dsl_dataset_name(ds, name);
+ dsl_pool_config_exit(tmpdp, FTAG);
dsl_dataset_rele(ds, FTAG);
(void) zfs_unmount_snap(name);
+ } else {
+ dsl_pool_config_exit(tmpdp, FTAG);
}
}
- dsl_pool_config_exit(tmpdp, FTAG);
#endif
} else {
/* Non-temporary holds are specified by name. */
More information about the svn-src-all
mailing list