diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2009-07-06 11:42:05 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2009-07-06 11:42:05 +0100 |
commit | 674801b080316c49543e6fb53623d8310f547945 (patch) | |
tree | 059eb1f1256234a3679327ca23296933b1e72c96 /tools/libfsimage | |
parent | d918a60f8913fec5dee77031ff986b8b6c94786e (diff) | |
download | xen-674801b080316c49543e6fb53623d8310f547945.tar.gz xen-674801b080316c49543e6fb53623d8310f547945.tar.bz2 xen-674801b080316c49543e6fb53623d8310f547945.zip |
libfsimage: Support for zfs version 16.
Remove version checks to support boot of ZFS root filesystem version
16.
Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com>
Diffstat (limited to 'tools/libfsimage')
-rw-r--r-- | tools/libfsimage/zfs/fsys_zfs.c | 5 | ||||
-rw-r--r-- | tools/libfsimage/zfs/zfs-include/dmu_objset.h | 9 | ||||
-rw-r--r-- | tools/libfsimage/zfs/zfs-include/zfs.h | 4 | ||||
-rw-r--r-- | tools/libfsimage/zfs/zfs-include/zfs_znode.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/tools/libfsimage/zfs/fsys_zfs.c b/tools/libfsimage/zfs/fsys_zfs.c index 0e4e6aeeaf..f398632c98 100644 --- a/tools/libfsimage/zfs/fsys_zfs.c +++ b/tools/libfsimage/zfs/fsys_zfs.c @@ -297,8 +297,7 @@ uberblock_verify(uberblock_phys_t *ub, int offset) if (zio_checksum_verify(&bp, (char *)ub, UBERBLOCK_SIZE) != 0) return (-1); - if (uber->ub_magic == UBERBLOCK_MAGIC && - uber->ub_version > 0 && uber->ub_version <= SPA_VERSION) + if (uber->ub_magic == UBERBLOCK_MAGIC && uber->ub_version > 0) return (0); return (-1); @@ -761,8 +760,6 @@ dnode_get_path(fsi_file_t *ffi, dnode_phys_t *mdn, char *path, if ((errnum = zap_lookup(ffi, dn, ZPL_VERSION_STR, &version, stack))) return (errnum); - if (version > ZPL_VERSION) - return (-1); if ((errnum = zap_lookup(ffi, dn, ZFS_ROOT_OBJ, &objnum, stack))) return (errnum); diff --git a/tools/libfsimage/zfs/zfs-include/dmu_objset.h b/tools/libfsimage/zfs/zfs-include/dmu_objset.h index 9ddc4814e0..8d1cf8ea33 100644 --- a/tools/libfsimage/zfs/zfs-include/dmu_objset.h +++ b/tools/libfsimage/zfs/zfs-include/dmu_objset.h @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +28,11 @@ typedef struct objset_phys { dnode_phys_t os_meta_dnode; zil_header_t os_zil_header; uint64_t os_type; - char os_pad[1024 - sizeof (dnode_phys_t) - sizeof (zil_header_t) - - sizeof (uint64_t)]; + uint64_t os_flags; + char os_pad[2048 - sizeof (dnode_phys_t)*3 - + sizeof (zil_header_t) - sizeof (uint64_t)*2]; + dnode_phys_t os_userused_dnode; + dnode_phys_t os_groupused_dnode; } objset_phys_t; #endif /* _SYS_DMU_OBJSET_H */ diff --git a/tools/libfsimage/zfs/zfs-include/zfs.h b/tools/libfsimage/zfs/zfs-include/zfs.h index 3fd679e458..5b1463fc43 100644 --- a/tools/libfsimage/zfs/zfs-include/zfs.h +++ b/tools/libfsimage/zfs/zfs-include/zfs.h @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,7 +28,7 @@ /* * On-disk version number. */ -#define SPA_VERSION 14ULL +#define SPA_VERSION 16ULL /* * The following are configuration names used in the nvlist describing a pool's diff --git a/tools/libfsimage/zfs/zfs-include/zfs_znode.h b/tools/libfsimage/zfs/zfs-include/zfs_znode.h index cd18e71b54..199b3a605e 100644 --- a/tools/libfsimage/zfs/zfs-include/zfs_znode.h +++ b/tools/libfsimage/zfs/zfs-include/zfs_znode.h @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,7 +28,7 @@ #define ZFS_ROOT_OBJ "ROOT" #define ZPL_VERSION_STR "VERSION" -#define ZPL_VERSION 3ULL +#define ZPL_VERSION 4ULL #define ZFS_DIRENT_OBJ(de) BF64_GET(de, 0, 48) |