diff options
| author | dfr <dfr@FreeBSD.org> | 2008-11-19 16:59:19 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2008-11-19 16:59:19 +0000 |
| commit | f0b4df1a333c70b87799d210bff88d8ca9320aed (patch) | |
| tree | 9ef246dbebe500ba9c6e05f321ebf198f4455e5d /sys/boot | |
| parent | d6f289d4433bdf255fa2c6abca2ab24c322bf884 (diff) | |
| download | FreeBSD-src-f0b4df1a333c70b87799d210bff88d8ca9320aed.zip FreeBSD-src-f0b4df1a333c70b87799d210bff88d8ca9320aed.tar.gz | |
Some zfsboot fixes from Norikatsu Shigemura:
1. zfsboot2 (boot2) doesn't %d (printf), so change %d to %u.
2. chase new zpool versioning as SPA_VERSION.
Obtained from: sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
Submitted by: nork
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/zfs/zfsimpl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index 5bbc351..c7c4c65 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -656,8 +656,9 @@ vdev_probe(vdev_read_t *read, void *read_priv, spa_t **spap) return (EIO); } - if (val != ZFS_VERSION) { - printf("ZFS: unsupported ZFS version %d\n", (int) val); + if (val > SPA_VERSION) { + printf("ZFS: unsupported ZFS version %u (should be %u)\n", + (unsigned) val, (unsigned) SPA_VERSION); return (EIO); } |
