d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On FreeBSD we can log from pool that have multiple top-level vdevs or log

Browse Source 
vdevs, so don't deny adding new vdevs if bootfs property is set.

MFC after:	2 weeks
This commit is contained in:
Pawel Jakub Dawidek 2010-09-09 21:20:18 +00:00
parent f60ec6d63d
commit 86b19d1861
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=212385
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
View File

@ -1217,8 +1217,12 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
{ {
spa_t *spa; spa_t *spa;
int error; int error;
#ifdef sun
nvlist_t *config, **l2cache, **spares; nvlist_t *config, **l2cache, **spares;
uint_t nl2cache = 0, nspares = 0; uint_t nl2cache = 0, nspares = 0;
#else
nvlist_t *config;
#endif
error = spa_open(zc->zc_name, &spa, FTAG); error = spa_open(zc->zc_name, &spa, FTAG);
if (error != 0) if (error != 0)
@ -1226,6 +1230,7 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size, error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
&config); &config);
#ifdef sun
(void) nvlist_lookup_nvlist_array(config, ZPOOL_CONFIG_L2CACHE, (void) nvlist_lookup_nvlist_array(config, ZPOOL_CONFIG_L2CACHE,
&l2cache, &nl2cache); &l2cache, &nl2cache);
@ -1246,6 +1251,7 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
spa_close(spa, FTAG); spa_close(spa, FTAG);
return (EDOM); return (EDOM);
} }
#endif
if (error == 0) { if (error == 0) {
error = spa_vdev_add(spa, config); error = spa_vdev_add(spa, config);