From 4696ce5d870513fc9b3c383ba7526b0b40c585df Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 12 Mar 2009 10:58:47 +0000 Subject: libfsimage: Support for zfs version 14. Signed-off-by: Susan Kamm-Worrell --- tools/libfsimage/zfs/fsys_zfs.c | 3 +-- tools/libfsimage/zfs/zfs-include/zfs.h | 12 +----------- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'tools/libfsimage') diff --git a/tools/libfsimage/zfs/fsys_zfs.c b/tools/libfsimage/zfs/fsys_zfs.c index 1409e3cde6..0e4e6aeeaf 100644 --- a/tools/libfsimage/zfs/fsys_zfs.c +++ b/tools/libfsimage/zfs/fsys_zfs.c @@ -298,8 +298,7 @@ uberblock_verify(uberblock_phys_t *ub, int offset) return (-1); if (uber->ub_magic == UBERBLOCK_MAGIC && - uber->ub_version >= SPA_VERSION_1 && - uber->ub_version <= SPA_VERSION) + uber->ub_version > 0 && uber->ub_version <= SPA_VERSION) return (0); return (-1); diff --git a/tools/libfsimage/zfs/zfs-include/zfs.h b/tools/libfsimage/zfs/zfs-include/zfs.h index 0187354853..3fd679e458 100644 --- a/tools/libfsimage/zfs/zfs-include/zfs.h +++ b/tools/libfsimage/zfs/zfs-include/zfs.h @@ -28,17 +28,7 @@ /* * On-disk version number. */ -#define SPA_VERSION_1 1ULL -#define SPA_VERSION_2 2ULL -#define SPA_VERSION_3 3ULL -#define SPA_VERSION_4 4ULL -#define SPA_VERSION_5 5ULL -#define SPA_VERSION_6 6ULL -#define SPA_VERSION_7 7ULL -#define SPA_VERSION_8 8ULL -#define SPA_VERSION_9 9ULL -#define SPA_VERSION_10 10ULL -#define SPA_VERSION SPA_VERSION_10 +#define SPA_VERSION 14ULL /* * The following are configuration names used in the nvlist describing a pool's -- cgit v1.2.3