Author: mm
Date: Wed Jun 13 08:00:32 2012
New Revision: 237001
URL: http://svn.freebsd.org/changeset/base/237001
Log:
Fix ZFS boot with pre-features pools (version <= 28) broken in r236884
Reported by: mav
MFC after: 1 month
Modified:
head/sys/boot/zfs/zfsimpl.c
Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c Wed Jun 13 06:57:55 2012 (r237000)
+++ head/sys/boot/zfs/zfsimpl.c Wed Jun 13 08:00:32 2012 (r237001)
@@ -888,9 +888,10 @@ vdev_probe(vdev_phys_read_t *read, void
}
/* 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,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
