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

If setting a state to anything but open state, close access to vdev.

Browse Source 
This fixes replacing drive in place, eg. zpool replace tank da1 da1.
Before it complained that device is already open.

MFC after:	1 week
This commit is contained in:
Pawel Jakub Dawidek 2007-11-05 21:30:48 +00:00
parent 907aa90518
commit a33b7a8f5f
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
View File

@ -1846,6 +1846,17 @@ vdev_set_state(vdev_t *vd, boolean_t isopen, vdev_state_t state, vdev_aux_t aux)
vd->vdev_state = state;
vd->vdev_stat.vs_aux = aux;
/*
* If we are setting the vdev state to anything but an open state, then
* always close the underlying device. Otherwise, we keep accessible
* but invalid devices open forever. We don't call vdev_close() itself,
* because that implies some extra checks (offline, etc) that we don't
* want here. This is limited to leaf devices, because otherwise
* closing the device will affect other children.
*/
if (vdev_is_dead(vd) && vd->vdev_ops->vdev_op_leaf)
vd->vdev_ops->vdev_op_close(vd);
if (state == VDEV_STATE_CANT_OPEN) {
/*
* If we fail to open a vdev during an import, we mark it as

11
sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c
View File

@ -1846,6 +1846,17 @@ vdev_set_state(vdev_t *vd, boolean_t isopen, vdev_state_t state, vdev_aux_t aux)
vd->vdev_state = state;
vd->vdev_stat.vs_aux = aux;
/*
* If we are setting the vdev state to anything but an open state, then
* always close the underlying device. Otherwise, we keep accessible
* but invalid devices open forever. We don't call vdev_close() itself,
* because that implies some extra checks (offline, etc) that we don't
* want here. This is limited to leaf devices, because otherwise
* closing the device will affect other children.
*/
if (vdev_is_dead(vd) && vd->vdev_ops->vdev_op_leaf)
vd->vdev_ops->vdev_op_close(vd);
if (state == VDEV_STATE_CANT_OPEN) {
/*
* If we fail to open a vdev during an import, we mark it as