On 06/14/2010 02:05 PM, Edward Shishkin wrote:Justin P. Mattock wrote:Not sure if this is correct or not.
the below patch gets rid of this warning message
produced by gcc 4.6.0
fs/reiserfs/stree.c: In function 'search_by_key':
fs/reiserfs/stree.c:602:6: warning: variable
'right_neighbor_of_leaf_node' set but not used
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Acked-by: Edward Shishkin <edward.shishkin@xxxxxxxxx>
o.k.!!
what about the whitespace issue?
from what I remember I did notice the "+"
that git does when making patches like this
but given some many of these warnings I just
did a quick workaround or however then figured
to worry later on that.
---
fs/reiserfs/stree.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 313d39d..73086ad 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -599,7 +599,6 @@ int search_by_key(struct super_block *sb, const
struct cpu_key *key, /* Key to s
struct buffer_head *bh;
struct path_element *last_element;
int node_level, retval;
- int right_neighbor_of_leaf_node;
int fs_gen;
struct buffer_head *reada_bh[SEARCH_BY_KEY_READA];
b_blocknr_t reada_blocks[SEARCH_BY_KEY_READA];
@@ -617,8 +616,7 @@ int search_by_key(struct super_block *sb, const
struct cpu_key *key, /* Key to s
pathrelse(search_path);
- right_neighbor_of_leaf_node = 0;
-
+
/* With each iteration of this loop we search through the items in the
current node, and calculate the next current node(next path element)
for the next iteration of this loop.. */
@@ -695,8 +693,7 @@ int search_by_key(struct super_block *sb, const
struct cpu_key *key, /* Key to s
starting from the root. */
block_number = SB_ROOT_BLOCK(sb);
expected_level = -1;
- right_neighbor_of_leaf_node = 0;
-
+
/* repeat search from the root */
continue;
}