| From | Ben Hutchings <> | Date | Tue, 24 Nov 2015 22:33:59 +0000 | Subject | [PATCH 3.2 10/52] Btrfs: added helper btrfs_next_item() |
| |
3.2.74-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
commit c7d22a3c3cdb73d8a0151e2ccc8cf4a48c48310b upstream.
btrfs_next_item() makes the btrfs path point to the next item, crossing leaf boundaries if needed.
Signed-off-by: Arne Jansen <sensille@gmx.net> Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net> [bwh: Dependency of the following fix] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- fs/btrfs/ctree.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 50634abe..3e4a07b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2482,6 +2482,13 @@ static inline int btrfs_insert_empty_item(struct btrfs_trans_handle *trans, } int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path); +static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) +{ + ++p->slots[0]; + if (p->slots[0] >= btrfs_header_nritems(p->nodes[0])) + return btrfs_next_leaf(root, p); + return 0; +} int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path); int btrfs_leaf_free_space(struct btrfs_root *root, struct extent_buffer *leaf); void btrfs_drop_snapshot(struct btrfs_root *root,
|