Btrfs: fix shadowed variable declarations

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 8a2bcc7..2464c09 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1734,7 +1734,6 @@ struct btrfs_root *open_ctree(struct super_block *sb,
                goto fail_cleaner;
 
        if (btrfs_super_log_root(disk_super) != 0) {
-               u32 blocksize;
                u64 bytenr = btrfs_super_log_root(disk_super);
 
                if (fs_devices->rw_devices == 0) {

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 1e8c024..1c92435 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -662,18 +662,18 @@ next_slot:
                }
 
                if (found_extent && !keep) {
-                       u64 disk_bytenr = le64_to_cpu(old.disk_bytenr);
+                       u64 old_disk_bytenr = le64_to_cpu(old.disk_bytenr);
 
-                       if (disk_bytenr != 0) {
+                       if (old_disk_bytenr != 0) {
                                inode_sub_bytes(inode,
                                                le64_to_cpu(old.num_bytes));
                                ret = btrfs_free_extent(trans, root,
-                                               disk_bytenr,
+                                               old_disk_bytenr,
                                                le64_to_cpu(old.disk_num_bytes),
                                                leaf_start, root_owner,
                                                root_gen, key.objectid, 0);
                                BUG_ON(ret);
-                               *hint_byte = disk_bytenr;
+                               *hint_byte = old_disk_bytenr;
                        }
                }