From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 5 Sep 2018 04:58:23 +0000 (-0700)
Subject: Revert "Update zfs_admin_snapshot default value (disabled)"
X-Git-Tag: zfs-0.8.0-rc1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27ca030fa68dd58fbb36714a6ddfc3fdf6974df3;p=zfs

Revert "Update zfs_admin_snapshot default value (disabled)"

This reverts commit a6214a0ae9e78d3cac0e495e2fcf7af0858a872f.
Disabling zfs_admin_snapshot by default results in multiple ZTS
tests failing which depend on this functionality.  Revert this
change until the relevant test cases can be updated.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #7838
---

diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
index f21ee9cf5..8a35c9947 100644
--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
@@ -106,7 +106,7 @@ static krwlock_t zfs_snapshot_lock;
  * Control Directory Tunables (.zfs)
  */
 int zfs_expire_snapshot = ZFSCTL_EXPIRE_SNAPSHOT;
-int zfs_admin_snapshot = 0;
+int zfs_admin_snapshot = 1;
 
 typedef struct {
 	char		*se_name;	/* full snapshot name */