Эх сурвалжийг харах

Btrfs: fix missing skinny metadata check in scrub_stripe()

Check if we support skinny metadata firstly and fix to use
right type to search.

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Wang Shilong 11 жил өмнө
parent
commit
7c76edb77c

+ 4 - 1
fs/btrfs/scrub.c

@@ -2373,8 +2373,11 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
 			scrub_blocked_if_needed(fs_info);
 			scrub_blocked_if_needed(fs_info);
 		}
 		}
 
 
+		if (btrfs_fs_incompat(fs_info, SKINNY_METADATA))
+			key.type = BTRFS_METADATA_ITEM_KEY;
+		else
+			key.type = BTRFS_EXTENT_ITEM_KEY;
 		key.objectid = logical;
 		key.objectid = logical;
-		key.type = BTRFS_EXTENT_ITEM_KEY;
 		key.offset = (u64)-1;
 		key.offset = (u64)-1;
 
 
 		ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
 		ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);