GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-05 22:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Btrfs: fix shadowed variable declarations

Browse source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Christoph Hellwig 2008-12-02 06:36:09 -05:00 • committed by Chris Mason
parent b2950863c6
commit 6e430f94e5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/btrfs/disk-io.c
View file

@ -1734,7 +1734,6 @@ struct btrfs_root *open_ctree(struct super_block *sb,
goto fail_cleaner; goto fail_cleaner;
if (btrfs_super_log_root(disk_super) != 0) { if (btrfs_super_log_root(disk_super) != 0) {
u32 blocksize;
u64 bytenr = btrfs_super_log_root(disk_super); u64 bytenr = btrfs_super_log_root(disk_super);
if (fs_devices->rw_devices == 0) { if (fs_devices->rw_devices == 0) {

8
fs/btrfs/file.c
View file

@ -662,18 +662,18 @@ next_slot:
} }
if (found_extent && !keep) { 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, inode_sub_bytes(inode,
le64_to_cpu(old.num_bytes)); le64_to_cpu(old.num_bytes));
ret = btrfs_free_extent(trans, root, ret = btrfs_free_extent(trans, root,
disk_bytenr, old_disk_bytenr,
le64_to_cpu(old.disk_num_bytes), le64_to_cpu(old.disk_num_bytes),
leaf_start, root_owner, leaf_start, root_owner,
root_gen, key.objectid, 0); root_gen, key.objectid, 0);
BUG_ON(ret); BUG_ON(ret);
*hint_byte = disk_bytenr; *hint_byte = old_disk_bytenr;
} }
} }