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

Fix ZFS boot with pre-features pools (version <= 28) broken in r236884

Browse Source 
Reported by:	mav
MFC after:	1 month
This commit is contained in:
mm 2012-06-13 08:00:32 +00:00
parent 528dfae9f3
commit d166ef6f42
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -888,9 +888,10 @@ vdev_probe(vdev_phys_read_t *read, void *read_priv, spa_t **spap)
}
/* Check ZFS features for read */
rc = nvlist_find(nvlist, ZPOOL_CONFIG_FEATURES_FOR_READ,
DATA_TYPE_NVLIST, 0, &features);
if (nvlist_check_features_for_read(features) != 0)
if (nvlist_find(nvlist,
ZPOOL_CONFIG_FEATURES_FOR_READ,
DATA_TYPE_NVLIST, 0, &features) == 0
&& nvlist_check_features_for_read(features) != 0)
return (EIO);
if (nvlist_find(nvlist,