From: Christoph Hellwig <hch@lst.de>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs: fix shadowed variable declarations
Date: Thu, 20 Nov 2008 19:42:20 +0100 [thread overview]
Message-ID: <20081120184220.GA20917@lst.de> (raw)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: btrfs-unstable/fs/btrfs/disk-io.c
===================================================================
--- btrfs-unstable.orig/fs/btrfs/disk-io.c 2008-11-09 21:25:35.000000000 +0100
+++ btrfs-unstable/fs/btrfs/disk-io.c 2008-11-09 21:25:47.000000000 +0100
@@ -1706,7 +1706,6 @@ struct btrfs_root *open_ctree(struct sup
goto fail_cleaner;
if (btrfs_super_log_root(disk_super) != 0) {
- u32 blocksize;
u64 bytenr = btrfs_super_log_root(disk_super);
blocksize =
Index: btrfs-unstable/fs/btrfs/file.c
===================================================================
--- btrfs-unstable.orig/fs/btrfs/file.c 2008-11-09 21:25:59.000000000 +0100
+++ btrfs-unstable/fs/btrfs/file.c 2008-11-09 21:26:57.000000000 +0100
@@ -659,18 +659,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;
}
}
reply other threads:[~2008-11-20 18:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081120184220.GA20917@lst.de \
--to=hch@lst.de \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox