From 296b051def1676b6fb7295a9a3a7a1811e7f9fbd Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 26 Apr 2013 16:06:09 -0500 Subject: Btrfs-progs: remove the unnecessary 'return -1;' at the end of bin_search The code path should not reach there. Remove it. [Eric Sandeen: port kernel commit 3fed40c to userspace] Signed-off-by: Wang Sheng-Hui Signed-off-by: Eric Sandeen Signed-off-by: David Sterba Signed-off-by: Chris Mason --- ctree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ctree.c') diff --git a/ctree.c b/ctree.c index 81db06df..2495e0ec 100644 --- a/ctree.c +++ b/ctree.c @@ -585,20 +585,18 @@ static int generic_bin_search(struct extent_buffer *eb, unsigned long p, static int bin_search(struct extent_buffer *eb, struct btrfs_key *key, int level, int *slot) { - if (level == 0) { + if (level == 0) return generic_bin_search(eb, offsetof(struct btrfs_leaf, items), sizeof(struct btrfs_item), key, btrfs_header_nritems(eb), slot); - } else { + else return generic_bin_search(eb, offsetof(struct btrfs_node, ptrs), sizeof(struct btrfs_key_ptr), key, btrfs_header_nritems(eb), slot); - } - return -1; } struct extent_buffer *read_node_slot(struct btrfs_root *root, -- cgit v1.2.3