Commit 23c6bf6a authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: fix btrfs_search_slot_for_read backwards iteration

If the current path's leaf slot is 0, we do search for the previous
leaf (via btrfs_prev_leaf) and set the new path's leaf slot to a
value corresponding to the number of items - 1 of the former leaf.
Fix this by using the slot set by btrfs_prev_leaf, decrementing it
by 1 if it's equal to the leaf's number of items.

Use of btrfs_search_slot_for_read() for backward iteration is used in
particular by the send feature, which could miss items when the input
leaf has less items than its previous leaf.

This could be reproduced by running btrfs/007 from xfstests in a loop.
Signed-off-by: default avatarFilipe David Borba Manana <>
Signed-off-by: default avatarChris Mason <>
parent 49fc647a
...@@ -3142,7 +3142,9 @@ int btrfs_search_slot_for_read(struct btrfs_root *root, ...@@ -3142,7 +3142,9 @@ int btrfs_search_slot_for_read(struct btrfs_root *root,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!ret) { if (!ret) {
p->slots[0] = btrfs_header_nritems(leaf) - 1; leaf = p->nodes[0];
if (p->slots[0] == btrfs_header_nritems(leaf))
return 0; return 0;
} }
if (!return_any) if (!return_any)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment