Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-10-16 10:46:11 -07:00
parent 69c211131d e2829a234d
commit a7d8ed4f5f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zpool/zpool_vdev.c
View File

@ -1083,7 +1083,7 @@ check_in_use(nvlist_t *config, nvlist_t *nv, int force, int isreplacing,
char *type, *path; char *type, *path;
int ret = 0; int ret = 0;
char buf[MAXPATHLEN]; char buf[MAXPATHLEN];
uint64_t wholedisk; uint64_t wholedisk = B_FALSE;
verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0); verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0);
@ -1091,8 +1091,9 @@ check_in_use(nvlist_t *config, nvlist_t *nv, int force, int isreplacing,
&child, &children) != 0) { &child, &children) != 0) {
verify(!nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path)); verify(!nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path));
verify(!nvlist_lookup_uint64(nv, ZPOOL_CONFIG_WHOLE_DISK, if (strcmp(type, VDEV_TYPE_DISK) == 0)
&wholedisk)); verify(!nvlist_lookup_uint64(nv,
ZPOOL_CONFIG_WHOLE_DISK, &wholedisk));
/* /*
* As a generic check, we look to see if this is a replace of a * As a generic check, we look to see if this is a replace of a