diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-08-02 17:05:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-02 19:35:22 -0400 |
commit | 0a11b9aae49adf1f952427ef1a1d9e793dd6ffb6 (patch) | |
tree | 017bbb0c522d832bdca22637f28a244fc4eea56e | |
parent | e63e88bc53bac7e4c3f592f8126c51a7569be673 (diff) |
reiserfs: fix "new_insert_key may be used uninitialized ..."
new_insert_key only makes any sense when it's associated with a
new_insert_ptr, which is initialized to NULL and changed to a
buffer_head when we also initialize new_insert_key. We can key off of
that to avoid the uninitialized warning.
Link: http://lkml.kernel.org/r/5eca5ffb-2155-8df2-b4a2-f162f105efed@suse.com
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jan Kara <jack@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/reiserfs/ibalance.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index b751eea32e20..5db6f45b3fed 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c | |||
@@ -1153,8 +1153,9 @@ int balance_internal(struct tree_balance *tb, | |||
1153 | insert_ptr); | 1153 | insert_ptr); |
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | memcpy(new_insert_key_addr, &new_insert_key, KEY_SIZE); | ||
1157 | insert_ptr[0] = new_insert_ptr; | 1156 | insert_ptr[0] = new_insert_ptr; |
1157 | if (new_insert_ptr) | ||
1158 | memcpy(new_insert_key_addr, &new_insert_key, KEY_SIZE); | ||
1158 | 1159 | ||
1159 | return order; | 1160 | return order; |
1160 | } | 1161 | } |