Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e430f94 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chris Mason
Browse files

Btrfs: fix shadowed variable declarations 



Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent b2950863

fs/btrfs/disk-io.c

+0 −1
Original line number Diff line number Diff line
@@ -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) {

fs/btrfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

			}

		}