Commit b99d9a6a authored by Fabian Frederick's avatar Fabian Frederick Committed by Chris Mason

btrfs: fix shadow warning on cmp

cmp was declared twice in btrfs_compare_trees resulting in a shadow
warning. This patch renames second internal variable.
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 1b6e4469
...@@ -5522,18 +5522,18 @@ int btrfs_compare_trees(struct btrfs_root *left_root, ...@@ -5522,18 +5522,18 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
goto out; goto out;
advance_right = ADVANCE; advance_right = ADVANCE;
} else { } else {
enum btrfs_compare_tree_result cmp; enum btrfs_compare_tree_result result;
WARN_ON(!extent_buffer_uptodate(left_path->nodes[0])); WARN_ON(!extent_buffer_uptodate(left_path->nodes[0]));
ret = tree_compare_item(left_root, left_path, ret = tree_compare_item(left_root, left_path,
right_path, tmp_buf); right_path, tmp_buf);
if (ret) if (ret)
cmp = BTRFS_COMPARE_TREE_CHANGED; result = BTRFS_COMPARE_TREE_CHANGED;
else else
cmp = BTRFS_COMPARE_TREE_SAME; result = BTRFS_COMPARE_TREE_SAME;
ret = changed_cb(left_root, right_root, ret = changed_cb(left_root, right_root,
left_path, right_path, left_path, right_path,
&left_key, cmp, ctx); &left_key, result, ctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
advance_left = ADVANCE; advance_left = ADVANCE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment