]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Prevent "zpool destroy|export" when suspended
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 Feb 2015 22:35:56 +0000 (14:35 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 2 Mar 2015 19:50:06 +0000 (11:50 -0800)
Cleanly destroying or exporting a pool requires that the pool
not be suspended.  Therefore, set the POOL_CHECK_SUSPENDED flag
for these ioctls so the utilities will output a descriptive
error message rather than block.

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

module/zfs/zfs_ioctl.c

index 998ee15962fd97abc7a5daf5ff0e7a92698cb2ff..cd7697058983a2349d1c26482ed494cdfd7dfc18 100644 (file)
@@ -5450,9 +5450,9 @@ zfs_ioctl_init(void)
         * does the logging of those commands.
         */
        zfs_ioctl_register_pool(ZFS_IOC_POOL_DESTROY, zfs_ioc_pool_destroy,
-           zfs_secpolicy_config, B_FALSE, POOL_CHECK_NONE);
+           zfs_secpolicy_config, B_FALSE, POOL_CHECK_SUSPENDED);
        zfs_ioctl_register_pool(ZFS_IOC_POOL_EXPORT, zfs_ioc_pool_export,
-           zfs_secpolicy_config, B_FALSE, POOL_CHECK_NONE);
+           zfs_secpolicy_config, B_FALSE, POOL_CHECK_SUSPENDED);
 
        zfs_ioctl_register_pool(ZFS_IOC_POOL_STATS, zfs_ioc_pool_stats,
            zfs_secpolicy_read, B_FALSE, POOL_CHECK_NONE);