Author: avg
Date: Wed Nov 20 11:09:12 2013
New Revision: 258386
URL: http://svnweb.freebsd.org/changeset/base/258386
Log:
4322 ZFS deadlock on dp_config_rwlock
illumos/illumos-gate@c50d56f667f119d78fa3d94d6bef2c298ba556f6
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Wed Nov 20
11:08:07 2013 (r258385)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Wed Nov 20
11:09:12 2013 (r258386)
@@ -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. */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
