diff options
| author | mm <mm@FreeBSD.org> | 2012-06-13 08:00:32 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-06-13 08:00:32 +0000 |
| commit | d166ef6f42b190ba064385b3ef0daacbcd53978b (patch) | |
| tree | a9028f0de0970cfc5bd7560a3d59ed4286ba576a /sys/boot/zfs | |
| parent | 528dfae9f303da46dcc4ebee63d6b187663d51a9 (diff) | |
| download | FreeBSD-src-d166ef6f42b190ba064385b3ef0daacbcd53978b.zip FreeBSD-src-d166ef6f42b190ba064385b3ef0daacbcd53978b.tar.gz | |
Fix ZFS boot with pre-features pools (version <= 28) broken in r236884
Reported by: mav
MFC after: 1 month
Diffstat (limited to 'sys/boot/zfs')
| -rw-r--r-- | sys/boot/zfs/zfsimpl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index a770e01..dd90c6c 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -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, |
