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

Alike to r293708 relax pool check in vdev_geom_open_by_path().

Browse Source 
This made impossible spare disk open by known path, which kind of worked
only because the same fix was applied to vdev_geom_attach_by_guids() in
r293708.

MFC after:	1 week
This commit is contained in:
Alexander Motin 2016-04-07 12:54:44 +00:00
parent 7af87ea720
commit 309b1c7ade
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
View File

@ -679,7 +679,15 @@ vdev_geom_open_by_path(vdev_t *vd, int check_guid)
g_topology_unlock();
vdev_geom_read_guids(cp, &pguid, &vguid);
g_topology_lock();
if (pguid != spa_guid(vd->vdev_spa) ||
/*
* Check that the label's vdev guid matches the
* desired guid. If the label has a pool guid,
* check that it matches too. (Inactive spares
* and L2ARCs do not have any pool guid in the
* label.)
*/
if ((pguid != 0 &&
pguid != spa_guid(vd->vdev_spa)) ||
vguid != vd->vdev_guid) {
vdev_geom_close_locked(vd);
cp = NULL;