diff options
| author | Christoph Hellwig <hch@lst.de> | 2008-12-02 06:36:09 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-12-02 06:36:09 -0500 |
| commit | 6e430f94e508fee1aefd1dfec88da3c24ce64433 (patch) | |
| tree | a93d163dbd42a16750f4ecbf4a333d8ea6ec1c0d /fs | |
| parent | b2950863c61bc24cf0f63bc05947d9d50663c4c0 (diff) | |
| download | kernel_samsung_smdk4412-6e430f94e508fee1aefd1dfec88da3c24ce64433.zip kernel_samsung_smdk4412-6e430f94e508fee1aefd1dfec88da3c24ce64433.tar.gz kernel_samsung_smdk4412-6e430f94e508fee1aefd1dfec88da3c24ce64433.tar.bz2 | |
Btrfs: fix shadowed variable declarations
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 1 | ||||
| -rw-r--r-- | fs/btrfs/file.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8a2bcc7..2464c09 100644 --- 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 --- 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; } } |