diff options
| author | Wang Sheng-Hui | 2012-03-30 09:14:27 +0200 |
|---|---|---|
| committer | Josef Bacik | 2012-05-11 16:56:37 +0200 |
| commit | f775738f6fba9c7f6deaa540860d6fb7e2d28445 (patch) | |
| tree | ad2276d30997368ea4f5fc90daee9d8c71ad03ba | |
| parent | Linux 3.4-rc6 (diff) | |
| download | kernel-qcow2-linux-f775738f6fba9c7f6deaa540860d6fb7e2d28445.tar.gz kernel-qcow2-linux-f775738f6fba9c7f6deaa540860d6fb7e2d28445.tar.xz kernel-qcow2-linux-f775738f6fba9c7f6deaa540860d6fb7e2d28445.zip | |
btrfs/ctree.c: remove the unnecessary 'return -1;' at the end of bin_search
The code path should not reach there. Remove it.
Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
| -rw-r--r-- | fs/btrfs/ctree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 4106264fbc65..26847999c649 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -854,20 +854,18 @@ static noinline int generic_bin_search(struct extent_buffer *eb, 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; } int btrfs_bin_search(struct extent_buffer *eb, struct btrfs_key *key, |