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>
(cherry picked from commit b99d9a6a4a41712c609a0b468512b2043a1b5f1d)

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index d1a0885b4dc03867aab5b4d1f98a472b92053585..150822ee0a0b9f9668f071885c4f018b1c9f6bf3 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -5500,18 +5500,18 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
                                        goto out;
                                advance_right = ADVANCE;
                        } else {
-                               enum btrfs_compare_tree_result cmp;
+                               enum btrfs_compare_tree_result result;
 
                                WARN_ON(!extent_buffer_uptodate(left_path->nodes[0]));
                                ret = tree_compare_item(left_root, left_path,
                                                right_path, tmp_buf);
                                if (ret)
-                                       cmp = BTRFS_COMPARE_TREE_CHANGED;
+                                       result = BTRFS_COMPARE_TREE_CHANGED;
                                else
-                                       cmp = BTRFS_COMPARE_TREE_SAME;
+                                       result = BTRFS_COMPARE_TREE_SAME;
                                ret = changed_cb(left_root, right_root,
                                                 left_path, right_path,
-                                                &left_key, cmp, ctx);
+                                                &left_key, result, ctx);
                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;