Author: avg
Date: Fri Sep 13 14:15:38 2013
New Revision: 255519
URL: http://svnweb.freebsd.org/changeset/base/255519

Log:
  MFC r254714: zfs: do not reject any operations on a pool just because
  it's a boot pool

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

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Sep 
13 14:07:32 2013        (r255518)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Sep 
13 14:15:38 2013        (r255519)
@@ -1828,6 +1828,7 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
        (void) nvlist_lookup_nvlist_array(config, ZPOOL_CONFIG_SPARES,
            &spares, &nspares);
 
+#ifdef illumos
        /*
         * A root pool with concatenated devices is not supported.
         * Thus, can not add a device to a root pool.
@@ -1843,6 +1844,7 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
                spa_close(spa, FTAG);
                return (SET_ERROR(EDOM));
        }
+#endif /* illumos */
 
        if (error == 0) {
                error = spa_vdev_add(spa, config);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"

Reply via email to