Illumos 5056 - ZFS deadlock on db_mtx and dn_holds (don't pull)

Not for pulling - patch out crgetzoneid(cr) until the appropriate change can be made in zfsonlinux/spl:include/sys/zone.h (?)
openzfs · Mar 31, 2015 · 2d17463 · 2d17463
1 parent 966cd01
commit 2d17463
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/module/zfs/dsl_dir.c b/module/zfs/dsl_dir.c
@@ -706,8 +706,10 @@ dsl_enforce_ds_ss_limits(dsl_dir_t *dd, zfs_prop_t prop, cred_t *cr)
 	    prop == ZFS_PROP_SNAPSHOT_LIMIT);
 
 #ifdef _KERNEL
+#if 0
 	if (crgetzoneid(cr) != GLOBAL_ZONEID)
 		return (ENFORCE_ALWAYS);
+#endif
 
 	if (secpolicy_zfs(cr) == 0)
 		return (ENFORCE_NEVER);