projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28e5dd8
)
Btrfs: fix missing skinny metadata check in scrub_stripe()
author
Wang Shilong
<
[email protected]
>
Sun, 12 Jan 2014 13:38:32 +0000
(21:38 +0800)
committer
Chris Mason
<
[email protected]
>
Tue, 28 Jan 2014 21:20:32 +0000
(13:20 -0800)
Check if we support skinny metadata firstly and fix to use
right type to search.
Signed-off-by: Wang Shilong <
[email protected]
>
Signed-off-by: Josef Bacik <
[email protected]
>
Signed-off-by: Chris Mason <
[email protected]
>
fs/btrfs/scrub.c
patch
|
blob
|
history
diff --git
a/fs/btrfs/scrub.c
b/fs/btrfs/scrub.c
index 7806e2c47f898670e4756ddfc135befaadbca35c..e0677e42d66d8abe28b04c17754c55943e436d35 100644
(file)
--- a/
fs/btrfs/scrub.c
+++ b/
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);
}
+ 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.type = BTRFS_EXTENT_ITEM_KEY;
key.offset = (u64)-1;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);