diff options
| author | Filipe David Borba Manana <fdmanana@gmail.com> | 2014-01-11 21:28:54 +0000 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-29 07:06:28 -0800 |
| commit | 23c6bf6a91e96c17a452e07b12b38ed66504e799 (patch) | |
| tree | c5955ef322a2034945408f873c0e6fa55af4e281 /fs/btrfs | |
| parent | 49fc647a2c558862145357f3a25892248042f6fe (diff) | |
| download | op-kernel-dev-23c6bf6a91e96c17a452e07b12b38ed66504e799.zip op-kernel-dev-23c6bf6a91e96c17a452e07b12b38ed66504e799.tar.gz | |
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: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ctree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 30f5b11..cbd3a7d 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -3142,7 +3142,9 @@ again: if (ret < 0) return ret; if (!ret) { - p->slots[0] = btrfs_header_nritems(leaf) - 1; + leaf = p->nodes[0]; + if (p->slots[0] == btrfs_header_nritems(leaf)) + p->slots[0]--; return 0; } if (!return_any) |
