svn commit: r332534 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Mon Apr 16 03:43:29 2018
New Revision: 332534
URL: https://svnweb.freebsd.org/changeset/base/332534

Log:
  MFC r329777: MFV r329776:
  8477 Assertion failed in vdev_state_dirty(): spa_writeable(spa)
  
  illumos/illumos-gate at f4c1745bd6c9829a05ecec15759ede7757100ab5
  
  Illumos 4080 allows "zpool clear" to work on readonly pools: i don't think
  this is the intended behaviour, we shouldn't be allowed to clear readonly
  pools. Probably.
  
  A fix is already in the ZFS on Linux repository to addess this issue:
  https://github.com/zfsonlinux/zfs/commit/92e43c17188d47f47b69318e4884096dec380e36
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: loli10K <ezomori.nozomu at gmail.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Mon Apr 16 03:42:47 2018	(r332533)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Mon Apr 16 03:43:29 2018	(r332534)
@@ -6150,7 +6150,7 @@ zfs_ioctl_init(void)
 	    zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE);
 
 	zfs_ioctl_register_pool(ZFS_IOC_CLEAR, zfs_ioc_clear,
-	    zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE);
+	    zfs_secpolicy_config, B_TRUE, POOL_CHECK_READONLY);
 	zfs_ioctl_register_pool(ZFS_IOC_POOL_REOPEN, zfs_ioc_pool_reopen,
 	    zfs_secpolicy_config, B_TRUE, POOL_CHECK_SUSPENDED);