From: Tony Asleson Date: Mon, 29 Apr 2024 18:04:12 +0000 (-0500) Subject: bcachefs: Remove BCACHEFS_SB_MAX_SIZE & check X-Git-Tag: v2.42-start~370^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63ffa1c6e616fd391fddabc15314d3a735c62d50;p=thirdparty%2Futil-linux.git bcachefs: Remove BCACHEFS_SB_MAX_SIZE & check This constant had an incorrect value. However, the code already does a max. size check which is correct. Note: bcachefs can theoretically have a superblock of 32MiB, but this is very unlikely to happen. Signed-off-by: Tony Asleson --- diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c index 47d906063..8ad2dc0f8 100644 --- a/libblkid/src/superblocks/bcache.c +++ b/libblkid/src/superblocks/bcache.c @@ -164,8 +164,6 @@ struct bcachefs_super_block { #define BCACHEFS_SECTOR_SIZE 512U /* maximum superblock size shift */ #define BCACHEFS_SB_MAX_SIZE_SHIFT 0x10U -/* maximum superblock size */ -#define BCACHEFS_SB_MAX_SIZE (1U << BCACHEFS_SB_MAX_SIZE_SHIFT) /* fields offset within super block */ #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) /* tag value for members field */ @@ -360,9 +358,6 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); - if (sb_size > BCACHEFS_SB_MAX_SIZE) - return BLKID_PROBE_NONE; - if (bcs->layout.sb_max_size_bits > BCACHEFS_SB_MAX_SIZE_SHIFT) return BLKID_PROBE_NONE;