# HG changeset patch # User John Levon <john.levon@sun.com> # Date 1236822104 25200 # Node ID ee0cc177dfa589c4cb21f6cb76aefeb0504a8100 # Parent c0559767ec1f4126b30460ed2161d75a363d5ee2 Support for zfs version 14. Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com> diff --git a/tools/libfsimage/zfs/fsys_zfs.c b/tools/libfsimage/zfs/fsys_zfs.c --- a/tools/libfsimage/zfs/fsys_zfs.c +++ b/tools/libfsimage/zfs/fsys_zfs.c @@ -298,8 +298,7 @@ uberblock_verify(uberblock_phys_t *ub, i 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 --- 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel