summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@suse.com>2026-02-03 18:14:01 +0300
committerDavid Sterba <dsterba@suse.com>2026-04-07 19:55:52 +0300
commitf3da62571ba25bf6c71076ee21420ed5257b84eb (patch)
tree3d09ef2d4c1d07a5d258014e8a19d4d78a9509ed
parentc4d30088fa28289aaf05ab421864ef8573ba9717 (diff)
downloadlinux-f3da62571ba25bf6c71076ee21420ed5257b84eb.tar.xz
btrfs: remove duplicate system chunk array max size overflow check
We check it twice, once in validate_sys_chunk_array() and then again in its caller, btrfs_validate_super(), right after it calls validate_sys_chunk_array(). So remove the duplicated check from btrfs_validate_super(). Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/disk-io.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1b0eb246b714..1b5fa0681331 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2545,12 +2545,6 @@ int btrfs_validate_super(const struct btrfs_fs_info *fs_info,
* Obvious sys_chunk_array corruptions, it must hold at least one key
* and one chunk
*/
- if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
- btrfs_err(fs_info, "system chunk array too big %u > %u",
- btrfs_super_sys_array_size(sb),
- BTRFS_SYSTEM_CHUNK_ARRAY_SIZE);
- ret = -EINVAL;
- }
if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key)
+ sizeof(struct btrfs_chunk)) {
btrfs_err(fs_info, "system chunk array too small %u < %zu",