diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-09-25 19:35:02 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-03 16:14:59 -0700 |
| commit | b99d9a6a4a41712c609a0b468512b2043a1b5f1d (patch) | |
| tree | 052a3b07603f742a8bccc1ee58b927f5d9ab02fc /fs/btrfs | |
| parent | 1b6e44690d2283e49c9e967d6a1739aac8490672 (diff) | |
| download | op-kernel-dev-b99d9a6a4a41712c609a0b468512b2043a1b5f1d.zip op-kernel-dev-b99d9a6a4a41712c609a0b468512b2043a1b5f1d.tar.gz | |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 39021bf..8d0703c 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -5522,18 +5522,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; |
