* grub-core/fs/zfs/zfs.c (uberblock_verify): Accept version 5000.

(check_pool_label): Likewise.
	* include/grub/zfs/zfs.h: Rewrite SPA_VERSION_* macros.
This commit is contained in:
Massimo Maggi 2013-07-14 14:01:27 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 53618046da
commit c71dbd40a9
3 changed files with 18 additions and 12 deletions

View file

@ -36,8 +36,12 @@ typedef enum grub_zfs_endian
/*
* On-disk version number.
*/
#define SPA_VERSION 33ULL
#define SPA_VERSION_INITIAL 1ULL
#define SPA_VERSION_BEFORE_FEATURES 33ULL
#define SPA_VERSION_FEATURES 5000ULL
#define SPA_VERSION_IS_SUPPORTED(v) \
(((v) >= SPA_VERSION_INITIAL && (v) <= SPA_VERSION_BEFORE_FEATURES) || \
((v) == SPA_VERSION_FEATURES))
/*
* The following are configuration names used in the nvlist describing a pool's
* configuration.