aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2024-05-01 21:20:50 +0200
committerKarel Zak <kzak@redhat.com>2024-05-01 21:20:50 +0200
commitf4975bf1bb864dfcb976d32fae49bbe48003b732 (patch)
tree7a817d588e383c6955a6c6ebe44f35e324a5ba9c
parent3f0473ae211b3ba98d55129b1d468b7feeb9cfb5 (diff)
parent63ffa1c6e616fd391fddabc15314d3a735c62d50 (diff)
downloadutil-linux-f4975bf1bb864dfcb976d32fae49bbe48003b732.tar.gz
Merge branch 'bcachefs_correct_max_size_constant' of https://github.com/tasleson/util-linux
* 'bcachefs_correct_max_size_constant' of https://github.com/tasleson/util-linux: bcachefs: Remove BCACHEFS_SB_MAX_SIZE & check
-rw-r--r--libblkid/src/superblocks/bcache.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 47d906063d..8ad2dc0f87 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;