From: Chris Mason Date: Wed, 25 Jun 2008 20:01:30 +0000 (-0400) Subject: Fix btrfs_next_leaf to check for new items after dropping locks X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=168fd7d271d9d8e81ff0b03eb08c36d82670c8a9;p=openwrt%2Fstaging%2Fblogic.git Fix btrfs_next_leaf to check for new items after dropping locks Signed-off-by: Chris Mason --- 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; }