ia64/xen-unstable

changeset 19328:40e8684a34bf

libfsimage: Support for zfs version 14.

Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 12 10:58:47 2009 +0000 (2009-03-12)
parents 3118041f2259
children 728df5693cd2
files tools/libfsimage/zfs/fsys_zfs.c tools/libfsimage/zfs/zfs-include/zfs.h
line diff
     1.1 --- a/tools/libfsimage/zfs/fsys_zfs.c	Thu Mar 12 10:58:21 2009 +0000
     1.2 +++ b/tools/libfsimage/zfs/fsys_zfs.c	Thu Mar 12 10:58:47 2009 +0000
     1.3 @@ -298,8 +298,7 @@ uberblock_verify(uberblock_phys_t *ub, i
     1.4  		return (-1);
     1.5  
     1.6  	if (uber->ub_magic == UBERBLOCK_MAGIC &&
     1.7 -	    uber->ub_version >= SPA_VERSION_1 &&
     1.8 -	    uber->ub_version <= SPA_VERSION)
     1.9 +	    uber->ub_version > 0 && uber->ub_version <= SPA_VERSION)
    1.10  		return (0);
    1.11  
    1.12  	return (-1);
     2.1 --- a/tools/libfsimage/zfs/zfs-include/zfs.h	Thu Mar 12 10:58:21 2009 +0000
     2.2 +++ b/tools/libfsimage/zfs/zfs-include/zfs.h	Thu Mar 12 10:58:47 2009 +0000
     2.3 @@ -28,17 +28,7 @@
     2.4  /*
     2.5   * On-disk version number.
     2.6   */
     2.7 -#define	SPA_VERSION_1			1ULL
     2.8 -#define	SPA_VERSION_2			2ULL
     2.9 -#define	SPA_VERSION_3			3ULL
    2.10 -#define	SPA_VERSION_4			4ULL
    2.11 -#define	SPA_VERSION_5			5ULL
    2.12 -#define	SPA_VERSION_6			6ULL
    2.13 -#define	SPA_VERSION_7			7ULL
    2.14 -#define	SPA_VERSION_8			8ULL
    2.15 -#define	SPA_VERSION_9			9ULL
    2.16 -#define	SPA_VERSION_10			10ULL
    2.17 -#define	SPA_VERSION			SPA_VERSION_10
    2.18 +#define	SPA_VERSION			14ULL
    2.19  
    2.20  /*
    2.21   * The following are configuration names used in the nvlist describing a pool's