c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bp_embedded_type enum definition

Browse Source 
With the addition of BP_EMBEDDED_TYPE_REDACTED in 30af21b0 a couple of
codepaths make wrong assumptions and could potentially result in errors.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #8951
This commit is contained in:
loli10K 2019-06-25 03:02:17 +02:00 committed by Brian Behlendorf
parent 13d454c6ca
commit 746d4a451e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/spa.h
View File

@ -407,9 +407,9 @@ _NOTE(CONSTCOND) } while (0)
typedef enum bp_embedded_type { typedef enum bp_embedded_type {
BP_EMBEDDED_TYPE_DATA, BP_EMBEDDED_TYPE_DATA,
BP_EMBEDDED_TYPE_RESERVED, /* Reserved for an unintegrated feature. */ BP_EMBEDDED_TYPE_RESERVED, /* Reserved for Delphix byteswap feature. */
BP_EMBEDDED_TYPE_REDACTED, BP_EMBEDDED_TYPE_REDACTED,
NUM_BP_EMBEDDED_TYPES = BP_EMBEDDED_TYPE_RESERVED NUM_BP_EMBEDDED_TYPES
} bp_embedded_type_t; } bp_embedded_type_t;
#define BPE_NUM_WORDS 14 #define BPE_NUM_WORDS 14

2
module/zfs/zio.c
View File

@ -908,7 +908,7 @@ zfs_blkptr_verify(spa_t *spa, const blkptr_t *bp)
} }
if (BP_IS_EMBEDDED(bp)) { if (BP_IS_EMBEDDED(bp)) {
if (BPE_GET_ETYPE(bp) > NUM_BP_EMBEDDED_TYPES) { if (BPE_GET_ETYPE(bp) >= NUM_BP_EMBEDDED_TYPES) {
zfs_panic_recover("blkptr at %p has invalid ETYPE %llu", zfs_panic_recover("blkptr at %p has invalid ETYPE %llu",
bp, (longlong_t)BPE_GET_ETYPE(bp)); bp, (longlong_t)BPE_GET_ETYPE(bp));
} }