diff options
| author | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
| commit | 2414a09002c0b7080b6044e995d127de758f3e12 (patch) | |
| tree | 1430d12f92f54e2d6f42cd1c36726627c2427969 /sys/cddl/boot | |
| parent | 0b0591131cdc07568e203ce41632d17adc436efb (diff) | |
| download | FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.zip FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.tar.gz | |
Apply OpenSolaris revision 8012 which brings our zpool to version 14,
making it possible for zpools created on OpenSolaris 2009.06 be used
on FreeBSD.
PR: kern/141800
Submitted by: mm
Reviewed by: pjd, trasz
Obtained from: OpenSolaris
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/boot')
| -rw-r--r-- | sys/cddl/boot/zfs/zfsimpl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index 688bb5c..1149eac 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -479,13 +479,14 @@ typedef enum { #define SPA_VERSION_11 11ULL #define SPA_VERSION_12 12ULL #define SPA_VERSION_13 13ULL +#define SPA_VERSION_14 14ULL /* * When bumping up SPA_VERSION, make sure GRUB ZFS understand the on-disk * format change. Go to usr/src/grub/grub-0.95/stage2/{zfs-include/, fsys_zfs*}, * and do the appropriate changes. */ -#define SPA_VERSION SPA_VERSION_13 -#define SPA_VERSION_STRING "13" +#define SPA_VERSION SPA_VERSION_14 +#define SPA_VERSION_STRING "14" /* * Symbolic names for the changes that caused a SPA_VERSION switch. @@ -520,6 +521,7 @@ typedef enum { #define SPA_VERSION_DSL_SCRUB SPA_VERSION_11 #define SPA_VERSION_SNAP_PROPS SPA_VERSION_12 #define SPA_VERSION_USED_BREAKDOWN SPA_VERSION_13 +#define SPA_VERSION_PASSTHROUGH_X SPA_VERSION_14 /* * The following are configuration names used in the nvlist describing a pool's |
