summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2013-08-23 14:43:32 +0000
committeravg <avg@FreeBSD.org>2013-08-23 14:43:32 +0000
commitedef8265888f92ea66b236fcb4c9e7f6cc1a0603 (patch)
tree0f4a9fd53acde23aaa9b9b4102dc09db19ce4fb7 /sys/cddl/contrib/opensolaris/uts
parentc27e328bd915134b979cf09c65f15a9b967510cb (diff)
downloadFreeBSD-src-edef8265888f92ea66b236fcb4c9e7f6cc1a0603.zip
FreeBSD-src-edef8265888f92ea66b236fcb4c9e7f6cc1a0603.tar.gz
zfs: do not reject any operations on a pool just because it's a boot pool
Unlike the upstream FreeBSD supports booting to all kinds of pools. Requested by: many Tested by: sbruno MFC after: 12 days
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
index 953e80c..10456f8 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -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);
OpenPOWER on IntegriCloud