diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-06-25 22:01:30 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 17:04:03 +0200 |
| commit | 168fd7d271d9d8e81ff0b03eb08c36d82670c8a9 (patch) | |
| tree | 147b1677446ba7a11ecc63a0364d33d378971fc0 /fs | |
| parent | Fix btrfs_del_ordered_inode to allow forcing the drop during unlinks (diff) | |
| download | linux-168fd7d271d9d8e81ff0b03eb08c36d82670c8a9.tar.xz linux-168fd7d271d9d8e81ff0b03eb08c36d82670c8a9.zip | |
Fix btrfs_next_leaf to check for new items after dropping locks
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 9601241e552b..b8f7aecf68d7 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2999,7 +2999,14 @@ int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path) return ret; nritems = btrfs_header_nritems(path->nodes[0]); + /* + * by releasing the path above we dropped all our locks. A balance + * could have added more items next to the key that used to be + * at the very end of the block. So, check again here and + * advance the path if there are now more items available. + */ if (nritems > 0 && path->slots[0] < nritems - 1) { + path->slots[0]++; goto done; } |