diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2013-04-26 16:06:09 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-08-09 14:32:28 +0200 |
| commit | 296b051def1676b6fb7295a9a3a7a1811e7f9fbd (patch) | |
| tree | e4fc2f06ead3869687e34dd5a87555587f37c8ea | |
| parent | 2e89e55682d950d03ee9e0ff510f969b5b0bdcaf (diff) | |
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 <shhuiw@gmail.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | ctree.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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, |