diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-15 11:53:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-15 11:53:56 +0000 |
| commit | 9f5f51bfbb3b88deac203d4a5a721684d859fce3 (patch) | |
| tree | 0f0c7d7e31aad834a63b18a9e4887e87b55a790f /usr/src/grub | |
| parent | 3e5c385058213debeef48e2ae511fe2be800e9e9 (diff) | |
| parent | 4b5c8e93cab28d3c65ba9d407fd8f46e3be1db1c (diff) | |
| download | illumos-joyent-9f5f51bfbb3b88deac203d4a5a721684d859fce3.tar.gz | |
[illumos-gate merge]
commit 4b5c8e93cab28d3c65ba9d407fd8f46e3be1db1c
7104 increase indirect block size
commit 470bc2d6d44a4a70ed9403c0bce321333e897c31
6327 devfsadm and bootadm taking long time for configs with large number of zvols
commit 25f7d993adbfb3452ac4625b3791670746d35ae3
7071 lzc_snapshot does not fill in errlist on ENOENT
commit dcbf3bd6a1f1360fc1afcee9e22c6dcff7844bf2
6950 ARC should cache compressed data
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/spa.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h index 822f67c923..a159cec627 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h @@ -23,7 +23,7 @@ */ /* - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013, 2015 by Delphix. All rights reserved. * Copyright (c) 2014 Integros [integros.com] */ @@ -81,6 +81,8 @@ #define SPA_PSIZEBITS 16 /* PSIZE up to 32M (2^16 * 512) */ #define SPA_ASIZEBITS 24 /* ASIZE up to 64 times larger */ +#define SPA_COMPRESSBITS 7 + /* * All SPA data is represented by 128-bit data virtual addresses (DVAs). * The members of the dva_t should be considered opaque outside the SPA. @@ -203,8 +205,10 @@ typedef struct blkptr { #define BP_SET_PSIZE(bp, x) \ BF64_SET_SB((bp)->blk_prop, 16, SPA_PSIZEBITS, SPA_MINBLOCKSHIFT, 1, x) -#define BP_GET_COMPRESS(bp) BF64_GET((bp)->blk_prop, 32, 7) -#define BP_SET_COMPRESS(bp, x) BF64_SET((bp)->blk_prop, 32, 7, x) +#define BP_GET_COMPRESS(bp) \ + BF64_GET((bp)->blk_prop, 32, SPA_COMPRESSBITS) +#define BP_SET_COMPRESS(bp, x) \ + BF64_SET((bp)->blk_prop, 32, SPA_COMPRESSBITS, x) #define BP_GET_CHECKSUM(bp) BF64_GET((bp)->blk_prop, 40, 8) #define BP_SET_CHECKSUM(bp, x) BF64_SET((bp)->blk_prop, 40, 8, x) |