summaryrefslogtreecommitdiff
path: root/ctree.c
diff options
context:
space:
mode:
authorZach Brown <zab@redhat.com>2013-08-14 16:16:34 -0700
committerDavid Sterba <dsterba@suse.cz>2013-09-03 19:41:02 +0200
commit19a2e1f4611eeff9668dacecafb6e51b5ca0f704 (patch)
treea6a821f87083f49c37f8307b454754436a8a4c2c /ctree.c
parent323bf8c5871f94b0623e98d575ccd79d19b14405 (diff)
btrfs-progs: fix shadow symbols
This fixes all the instances of warnings that symbols declared in blocks shadow symbols with the same name in surrounding scopes: cmds-device.c:341:22: warning: symbol 'path' shadows an earlier one cmds-device.c:285:14: originally declared here I just renamed or removed the risky shadow symbols instead of pulling their blocks out into functions. Signed-off-by: Zach Brown <zab@redhat.com> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'ctree.c')
-rw-r--r--ctree.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ctree.c b/ctree.c
index a79ed13d..1b093f6b 100644
--- a/ctree.c
+++ b/ctree.c
@@ -2401,7 +2401,6 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
BUG_ON(slot < 0);
if (slot != nritems) {
- int i;
unsigned int old_data = btrfs_item_end_nr(leaf, slot);
if (old_data < data_end) {
@@ -2580,7 +2579,6 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
nritems = btrfs_header_nritems(leaf);
if (slot + nr != nritems) {
- int i;
int data_end = leaf_data_end(root, leaf);
memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +