summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2008-12-02 06:36:09 -0500
committerChris Mason <chris.mason@oracle.com>2008-12-02 06:36:09 -0500
commit6e430f94e508fee1aefd1dfec88da3c24ce64433 (patch)
treea93d163dbd42a16750f4ecbf4a333d8ea6ec1c0d /fs/btrfs/file.c
parentb2950863c61bc24cf0f63bc05947d9d50663c4c0 (diff)
downloadop-kernel-dev-6e430f94e508fee1aefd1dfec88da3c24ce64433.zip
op-kernel-dev-6e430f94e508fee1aefd1dfec88da3c24ce64433.tar.gz
Btrfs: fix shadowed variable declarations
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c8
1 files changed, 4 insertions, 4 deletions
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;
}
}
OpenPOWER on IntegriCloud