Skip to content

btrfs: Introduce macro to iterate over slots

Gabriel Niebler linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest14 patches 1 replyIn review
  2. v314 patches 4 repliesSuperseded

Changes in v4 from the cover letter

* Surround arguments with (…) in iterator macro definition (David)
* Fix btrfs_unlink_all_paths after key/found_key confusion broke btrfs/168 (Josef)
* Various stylistic improvements (David)

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14btrfs: Introduce btrfs_for_each_slot iterator macrofs/btrfs/ctree.c fs/btrfs/ctree.h+60 -00 replies
2/14btrfs: Use btrfs_for_each_slot in find_first_block_groupfs/btrfs/block-group.c+2 -240 replies
3/14btrfs: Use btrfs_for_each_slot in mark_block_group_to_copyfs/btrfs/dev-replace.c+7 -330 replies
4/14btrfs: Use btrfs_for_each_slot in btrfs_search_dir_index_itemfs/btrfs/dir-item.c+6 -250 replies
5/14btrfs: Use btrfs_for_each_slot in btrfs_real_readdirfs/btrfs/inode.c+10 -250 replies
6/14btrfs: Use btrfs_for_each_slot in did_create_dirfs/btrfs/send.c+11 -290 replies
7/14btrfs: Use btrfs_for_each_slot in can_rmdirfs/btrfs/send.c+6 -170 replies
8/14btrfs: Use btrfs_for_each_slot in is_ancestorfs/btrfs/send.c+7 -180 replies
9/14btrfs: Use btrfs_for_each_slot in process_all_refsfs/btrfs/send.c+9 -240 replies
10/14btrfs: Use btrfs_for_each_slot in process_all_new_xattrsfs/btrfs/send.c+8 -270 replies
11/14btrfs: Use btrfs_for_each_slot in process_all_extentsfs/btrfs/send.c+8 -290 replies
12/14btrfs: Use btrfs_for_each_slot in btrfs_unlink_all_pathsfs/btrfs/send.c+13 -230 replies
13/14btrfs: Use btrfs_for_each_slot in btrfs_read_chunk_treefs/btrfs/volumes.c+9 -160 replies
14/14btrfs: Use btrfs_for_each_slot in btrfs_listxattrfs/btrfs/xattr.c+11 -290 replies

Reviews trailers per patch

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

Read the v4 thread

Cover letter [PATCH v4 0/14] btrfs: Introduce macro to iterate over slots

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

* Call btrfs_search_slot to find the slot for the key
* Enter an endless loop:
* If the found slot is larger than the no. of items in the current leaf, check the next leaf
* If it's still not found in the next leaf, terminate the loop
* Otherwise do something with the found key
* Increment the current slot and continue

To reduce code duplication, we can replace this code pattern with an iterator macro, similar to the existing for_each_X macros found elsewhere in the kernel. This also makes the code easier to understand for newcomers by putting a name to the encapsulated functionality.

This patchset survived a complete fstest run.

Changes from v3:
* Surround arguments with (…) in iterator macro definition (David)
* Fix btrfs_unlink_all_paths after key/found_key confusion broke btrfs/168 (Josef)
* Various stylistic improvements (David)

Changes from v2:
* Rename btrfs_valid_slot to btrfs_get_next_valid_item (Nikolay)
* Fix comment formatting (David)
* Remove redundant parentheses and indentation in loop condition (David)
* Remove redundant iter_ret var and reuse ret instead (Nikolay)
* Make termination condition more consistent in btrfs_unlink_all_paths (Nikolay)
* Improved patch organisation by splitting into one patch per function (David)
* Improve doc comment for btrfs_get_next_valid_item (Gabriel)
* Remove out label and assoc. gotos from id_create_dir (Gabriel)
* Initialise ret in process_all_refs and process_all_new_xattrs (Gabriel)
* Remove unneeded btrfs_item_key_to_cpu call from loop body in btrfs_read_chunk_tree (Gabriel)

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 (14):
btrfs: Introduce btrfs_for_each_slot iterator macro
btrfs: Use btrfs_for_each_slot in find_first_block_group
btrfs: Use btrfs_for_each_slot in mark_block_group_to_copy
btrfs: Use btrfs_for_each_slot in btrfs_search_dir_index_item
btrfs: Use btrfs_for_each_slot in btrfs_real_readdir
btrfs: Use btrfs_for_each_slot in did_create_dir
btrfs: Use btrfs_for_each_slot in can_rmdir
btrfs: Use btrfs_for_each_slot in is_ancestor
btrfs: Use btrfs_for_each_slot in process_all_refs
btrfs: Use btrfs_for_each_slot in process_all_new_xattrs
btrfs: Use btrfs_for_each_slot in process_all_extents
btrfs: Use btrfs_for_each_slot in btrfs_unlink_all_paths
btrfs: Use btrfs_for_each_slot in btrfs_read_chunk_tree
btrfs: Use btrfs_for_each_slot in btrfs_listxattr

 fs/btrfs/block-group.c |  26 +-----
 fs/btrfs/ctree.c       |  35 ++++++++
 fs/btrfs/ctree.h       |  25 ++++++
 fs/btrfs/dev-replace.c |  40 ++-------
 fs/btrfs/dir-item.c    |  31 ++-----
 fs/btrfs/inode.c       |  35 +++-----
 fs/btrfs/send.c        | 229 +++++++++++++------------------------------------
 fs/btrfs/volumes.c     |  25 ++----
 fs/btrfs/xattr.c       |  40 +++------
 9 files changed, 167 insertions(+), 319 deletions(-)