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

Remove duplicated code.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Pawel Jakub Dawidek 2010-09-09 21:15:16 +00:00
parent 40438ef706
commit e66811b193
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/boot/zfs/zfsimpl.c
View File

@ -488,7 +488,16 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vdev_t **vdevp, int is_newer)
vdev->v_name = strdup(type); vdev->v_name = strdup(type);
} }
} }
} else {
is_new = 0;
}
if (is_new || is_newer) {
/*
* This is either new vdev or we've already seen this vdev,
* but from an older vdev label, so let's refresh its state
* from the newer label.
*/
if (is_offline) if (is_offline)
vdev->v_state = VDEV_STATE_OFFLINE; vdev->v_state = VDEV_STATE_OFFLINE;
else if (is_removed) else if (is_removed)
@ -499,26 +508,6 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vdev_t **vdevp, int is_newer)
vdev->v_state = VDEV_STATE_DEGRADED; vdev->v_state = VDEV_STATE_DEGRADED;
else else
vdev->v_state = VDEV_STATE_HEALTHY; vdev->v_state = VDEV_STATE_HEALTHY;
} else {
is_new = 0;
if (is_newer) {
/*
* We've already seen this vdev, but from an older
* vdev label, so let's refresh its state from the
* newer label.
*/
if (is_offline)
vdev->v_state = VDEV_STATE_OFFLINE;
else if (is_removed)
vdev->v_state = VDEV_STATE_REMOVED;
else if (is_faulted)
vdev->v_state = VDEV_STATE_FAULTED;
else if (is_degraded)
vdev->v_state = VDEV_STATE_DEGRADED;
else
vdev->v_state = VDEV_STATE_HEALTHY;
}
} }
rc = nvlist_find(nvlist, ZPOOL_CONFIG_CHILDREN, rc = nvlist_find(nvlist, ZPOOL_CONFIG_CHILDREN,