diff options
author | avg <avg@FreeBSD.org> | 2016-06-16 07:45:57 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2016-06-16 07:45:57 +0000 |
commit | 9e30632a5b009e8a41730c4dfcc7b1a9cb9dce99 (patch) | |
tree | 63b9e8c7ccb90b176a29ad0bc43f4eb87e959ac8 /etc/freebsd-update.conf | |
parent | ddb2ec780829b74561513dd31ae7187800356412 (diff) | |
download | FreeBSD-src-9e30632a5b009e8a41730c4dfcc7b1a9cb9dce99.zip FreeBSD-src-9e30632a5b009e8a41730c4dfcc7b1a9cb9dce99.tar.gz |
fix a zfs boot regression introduced in r300117 by accident
There is no reason to return non-zero value from zfs_probe_partition()
as that causes following partitions to not be probed for ZFS vdevs.
A particular scenario that I encountered is a GPT partitioned disk
where several partitions have freebsd-zfs type. A partition with a lower
index is used as a cache (l2arc) vdev and in that case case zfs_probe()
returned a non-zero status. That status was returned to ptable_iterate()
and caused it to abort the iteration. Because of that the subsequent
partitions were not probed and a root pool was not discovered resulting
in a boot failure.
While there fix the style for nearby return statements.
Approved by: re (kib)
Diffstat (limited to 'etc/freebsd-update.conf')
0 files changed, 0 insertions, 0 deletions