Skip to content

Commit 8bb177d

Browse files
adam900710kdave
authored andcommitted
btrfs: tree-checker: Fix wrong check on max devid
[BUG] The following script will cause false alert on devid check. #!/bin/bash dev1=/dev/test/test dev2=/dev/test/scratch1 mnt=/mnt/btrfs umount $dev1 &> /dev/null umount $dev2 &> /dev/null umount $mnt &> /dev/null mkfs.btrfs -f $dev1 mount $dev1 $mnt _fail() { echo "!!! FAILED !!!" exit 1 } for ((i = 0; i < 4096; i++)); do btrfs dev add -f $dev2 $mnt || _fail btrfs dev del $dev1 $mnt || _fail dev_tmp=$dev1 dev1=$dev2 dev2=$dev_tmp done [CAUSE] Tree-checker uses BTRFS_MAX_DEVS() and BTRFS_MAX_DEVS_SYS_CHUNK() as upper limit for devid. But we can have devid holes just like above script. So the check for devid is incorrect and could cause false alert. [FIX] Just remove the whole devid check. We don't have any hard requirement for devid assignment. Furthermore, even devid could get corrupted by a bitflip, we still have dev extents verification at mount time, so corrupted data won't sneak in. This fixes fstests btrfs/194. Reported-by: Anand Jain <anand.jain@oracle.com> Fixes: ab4ba2e ("btrfs: tree-checker: Verify dev item") CC: stable@vger.kernel.org # 5.2+ Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent c17add7 commit 8bb177d

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

fs/btrfs/tree-checker.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -686,22 +686,14 @@ static void dev_item_err(const struct extent_buffer *eb, int slot,
686686
static int check_dev_item(struct extent_buffer *leaf,
687687
struct btrfs_key *key, int slot)
688688
{
689-
struct btrfs_fs_info *fs_info = leaf->fs_info;
690689
struct btrfs_dev_item *ditem;
691-
u64 max_devid = max(BTRFS_MAX_DEVS(fs_info), BTRFS_MAX_DEVS_SYS_CHUNK);
692690

693691
if (key->objectid != BTRFS_DEV_ITEMS_OBJECTID) {
694692
dev_item_err(leaf, slot,
695693
"invalid objectid: has=%llu expect=%llu",
696694
key->objectid, BTRFS_DEV_ITEMS_OBJECTID);
697695
return -EUCLEAN;
698696
}
699-
if (key->offset > max_devid) {
700-
dev_item_err(leaf, slot,
701-
"invalid devid: has=%llu expect=[0, %llu]",
702-
key->offset, max_devid);
703-
return -EUCLEAN;
704-
}
705697
ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item);
706698
if (btrfs_device_id(leaf, ditem) != key->offset) {
707699
dev_item_err(leaf, slot,

0 commit comments

Comments
 (0)