aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-09-25 13:35:02 -0400
committerChris Mason <clm@fb.com>2014-10-03 19:14:59 -0400
commitb99d9a6a4a41712c609a0b468512b2043a1b5f1d (patch)
tree052a3b07603f742a8bccc1ee58b927f5d9ab02fc /fs/btrfs
parent1b6e44690d2283e49c9e967d6a1739aac8490672 (diff)
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ctree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 39021bf2df9a..8d0703cc7402 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -5522,18 +5522,18 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
5522 goto out; 5522 goto out;
5523 advance_right = ADVANCE; 5523 advance_right = ADVANCE;
5524 } else { 5524 } else {
5525 enum btrfs_compare_tree_result cmp; 5525 enum btrfs_compare_tree_result result;
5526 5526
5527 WARN_ON(!extent_buffer_uptodate(left_path->nodes[0])); 5527 WARN_ON(!extent_buffer_uptodate(left_path->nodes[0]));
5528 ret = tree_compare_item(left_root, left_path, 5528 ret = tree_compare_item(left_root, left_path,
5529 right_path, tmp_buf); 5529 right_path, tmp_buf);
5530 if (ret) 5530 if (ret)
5531 cmp = BTRFS_COMPARE_TREE_CHANGED; 5531 result = BTRFS_COMPARE_TREE_CHANGED;
5532 else 5532 else
5533 cmp = BTRFS_COMPARE_TREE_SAME; 5533 result = BTRFS_COMPARE_TREE_SAME;
5534 ret = changed_cb(left_root, right_root, 5534 ret = changed_cb(left_root, right_root,
5535 left_path, right_path, 5535 left_path, right_path,
5536 &left_key, cmp, ctx); 5536 &left_key, result, ctx);
5537 if (ret < 0) 5537 if (ret < 0)
5538 goto out; 5538 goto out;
5539 advance_left = ADVANCE; 5539 advance_left = ADVANCE;