diff options
| author | Yan <yanzheng@21cn.com> | 2008-07-24 12:19:49 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:05 -0400 |
| commit | 9652480bf48500885a30754b4a5c436b5b34456d (patch) | |
| tree | 396958a55cd1be287a093821d916b0c7b86bb5e2 /fs/btrfs/ctree.c | |
| parent | 445dceb78f3445b9bcade90e93ca35cae6120172 (diff) | |
| download | linux-3.10-9652480bf48500885a30754b4a5c436b5b34456d.tar.gz linux-3.10-9652480bf48500885a30754b4a5c436b5b34456d.tar.bz2 linux-3.10-9652480bf48500885a30754b4a5c436b5b34456d.zip | |
Fix path slots selection in btrfs_search_forward
We should decrease the found slot by one as btrfs_search_slot does
when bin_search return 1 and node level > 0.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index f2a94999c37..ab4ac0365c7 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2992,6 +2992,7 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, struct extent_buffer *cur; struct btrfs_key found_key; int slot; + int sret; u32 nritems; int level; int ret = 1; @@ -3009,7 +3010,7 @@ again: while(1) { nritems = btrfs_header_nritems(cur); level = btrfs_header_level(cur); - bin_search(cur, min_key, level, &slot); + sret = bin_search(cur, min_key, level, &slot); /* at level = 0, we're done, setup the path and exit */ if (level == 0) { @@ -3018,6 +3019,8 @@ again: btrfs_item_key_to_cpu(cur, &found_key, slot); goto out; } + if (sret && slot > 0) + slot--; /* * check this node pointer against the cache_only and * min_trans parameters. If it isn't in cache or is too |