hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Fabian Frederick 2014-09-25 19:35:02 +02:00 committed by Chris Mason
parent 1b6e44690d
commit b99d9a6a4a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/ctree.c
View File

@ -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;