diff options
| author | George Wilson <George.Wilson@Sun.COM> | 2009-09-21 10:38:24 -0700 |
|---|---|---|
| committer | George Wilson <George.Wilson@Sun.COM> | 2009-09-21 10:38:24 -0700 |
| commit | 88ecc943b4eb72f7c4fbbd8435997b85ef171fc3 (patch) | |
| tree | ebceb7c59c849c35d63917995146dc8ad430fa31 /usr/src/grub | |
| parent | 53520bfd0d8e6401efee237b91e682ab66f77eef (diff) | |
| download | illumos-joyent-88ecc943b4eb72f7c4fbbd8435997b85ef171fc3.tar.gz | |
6574286 removing a slog doesn't work
6856566 zpool import -F can cause panic
6863456 system panic by load_nvlist(spa, spa->spa_config_object, &nv) == 0 while running zfs test suite
6882947 dump_nvlist() should live in libnvpair
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/capability | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/grub/capability b/usr/src/grub/capability index 5d81d0e2f3..25987fb4f7 100644 --- a/usr/src/grub/capability +++ b/usr/src/grub/capability @@ -40,7 +40,7 @@ # This file and the associated version are Solaris specific and are # not a part of the open source distribution of GRUB. # -VERSION=11 +VERSION=12 dboot xVM zfs diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h index 4e4a72c139..612a0c4c2d 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h @@ -27,7 +27,7 @@ /* * On-disk version number. */ -#define SPA_VERSION 18ULL +#define SPA_VERSION 19ULL /* * The following are configuration names used in the nvlist describing a pool's @@ -61,6 +61,9 @@ #define ZPOOL_CONFIG_NPARITY "nparity" #define ZPOOL_CONFIG_PHYS_PATH "phys_path" #define ZPOOL_CONFIG_L2CACHE "l2cache" +#define ZPOOL_CONFIG_HOLE_ARRAY "hole_array" +#define ZPOOL_CONFIG_VDEV_CHILDREN "vdev_children" +#define ZPOOL_CONFIG_IS_HOLE "is_hole" /* * The persistent vdev state is stored as separate values rather than a single * 'vdev_state' entry. This is because a device can be in multiple states, such @@ -78,6 +81,7 @@ #define VDEV_TYPE_DISK "disk" #define VDEV_TYPE_FILE "file" #define VDEV_TYPE_MISSING "missing" +#define VDEV_TYPE_HOLE "hole" #define VDEV_TYPE_SPARE "spare" #define VDEV_TYPE_L2CACHE "l2cache" |