Skip to content

btrfs: Create macro to iterate slots

Marcos Paulo de Souza linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest8 patches 9 repliesIn review
  2. v17 patches 3 repliesSuperseded

Changes in v2 from the cover letter

* Separate xattr changes from the macro introducing code (Johannes)

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8fs: btrfs: Introduce btrfs_for_each_slotfs/btrfs/ctree.c fs/btrfs/ctree.h+53 -03 replies
2/8btrfs: block-group: use btrfs_for_each_slot in find_first_block_groupfs/btrfs/block-group.c+5 -280 replies
3/8btrfs: dev-replace: Use btrfs_for_each_slot in mark_block_group_to_copyfs/btrfs/dev-replace.c+11 -400 replies
4/8btrfs: dir-item: use btrfs_for_each_slot in btrfs_search_dir_index_itemfs/btrfs/dir-item.c+3 -240 replies
5/8btrfs: inode: use btrfs_for_each_slot in btrfs_read_readdirfs/btrfs/inode.c+17 -293 replies
6/8btrfs: send: Use btrfs_for_each_slot macrofs/btrfs/send.c+59 -1631 reply
7/8btrfs: volumes: use btrfs_for_each_slot in btrfs_read_chunk_treefs/btrfs/volumes.c+9 -140 replies
8/8btrfs: xattr: Use btrfs_for_each_slot macro in btrfs_listxattrfs/btrfs/xattr.c+12 -280 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCHv2 0/8] btrfs: Create macro to iterate slots

There is a common pattern when search for a key in btrfs:

* Call btrfs_search_slot
* Endless loop
* If the found slot is bigger than the current items in the leaf, check the next one
* If still not found in the next leaf, return 1
* Do something with the code
* Increment current slot, and continue

This pattern can be improved by creating an iterator macro, similar to those for_each_X already existing in the linux kernel. using this approach means to reduce significantly boilerplate code, along making it easier to newcomers to understand how to code works.

This patchset survived a complete fstest run.

Changes from v1:
* Separate xattr changes from the macro introducing code (Johannes)

Changes from RFC:
* Add documentation to btrfs_for_each_slot macro and btrfs_valid_slot function (David)
* Add documentation about the ret variable used as a macro argument (David)
* Match function argument from prototype and implementation (David)
* Changed ({ }) block to only () in btrfs_for_each_slot macro (David)
* Add more patches to show the code being reduced by using this approach (Nikolay)

Marcos Paulo de Souza (8):
fs: btrfs: Introduce btrfs_for_each_slot
btrfs: block-group: use btrfs_for_each_slot in find_first_block_group
btrfs: dev-replace: Use btrfs_for_each_slot in
mark_block_group_to_copy
btrfs: dir-item: use btrfs_for_each_slot in
btrfs_search_dir_index_item
btrfs: inode: use btrfs_for_each_slot in btrfs_read_readdir
btrfs: send: Use btrfs_for_each_slot macro
btrfs: volumes: use btrfs_for_each_slot in btrfs_read_chunk_tree
btrfs: xattr: Use btrfs_for_each_slot macro in btrfs_listxattr

 fs/btrfs/block-group.c |  33 +-----
 fs/btrfs/ctree.c       |  28 ++++++
 fs/btrfs/ctree.h       |  25 +++++
 fs/btrfs/dev-replace.c |  51 ++--------
 fs/btrfs/dir-item.c    |  27 +----
 fs/btrfs/inode.c       |  46 ++++-----
 fs/btrfs/send.c        | 222 +++++++++++------------------------------
 fs/btrfs/volumes.c     |  23 ++---
 fs/btrfs/xattr.c       |  40 +++-----
 9 files changed, 169 insertions(+), 326 deletions(-)
Signature · 1 line
2.31.1