From 19a2e1f4611eeff9668dacecafb6e51b5ca0f704 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 14 Aug 2013 16:16:34 -0700 Subject: 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 Signed-off-by: David Sterba Signed-off-by: Chris Mason --- ctree.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ctree.c') 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) + -- cgit v1.2.3