[Xen-changelog] [xen-unstable] libfsimage: Support for zfs version 14.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236855527 0
# Node ID 40e8684a34bfda0a51d2305fae343c78e0b7a70c
# Parent  3118041f2259709c529bfb2222f8071e8cc88de3
libfsimage: Support for zfs version 14.

Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@xxxxxxx>
---
 tools/libfsimage/zfs/fsys_zfs.c        |    3 +--
 tools/libfsimage/zfs/zfs-include/zfs.h |   12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff -r 3118041f2259 -r 40e8684a34bf tools/libfsimage/zfs/fsys_zfs.c
--- a/tools/libfsimage/zfs/fsys_zfs.c   Thu Mar 12 10:58:21 2009 +0000
+++ b/tools/libfsimage/zfs/fsys_zfs.c   Thu Mar 12 10:58:47 2009 +0000
@@ -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 -r 3118041f2259 -r 40e8684a34bf tools/libfsimage/zfs/zfs-include/zfs.h
--- a/tools/libfsimage/zfs/zfs-include/zfs.h    Thu Mar 12 10:58:21 2009 +0000
+++ b/tools/libfsimage/zfs/zfs-include/zfs.h    Thu Mar 12 10:58:47 2009 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog