btrfs: a variety of header file cleanups
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest11 patches 1 replyIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/11 | btrfs: move root helpers back into ctree.hfs/ fs/ | +17 | 0 replies | |
| 2/11 | btrfs: move leaf_data_end into ctree.cfs/ fs/ fs/ | +18 | 0 replies | |
| 3/11 | btrfs: move file_extent_item helpers into file-item.hfs/ fs/ fs/ +2 more | +36 | 0 replies | |
| 4/11 | btrfs: move eb offset helpers into extent_io.hfs/ fs/ | +33 | 0 replies | |
| 5/11 | btrfs: move the csum helpers into ctree.hfs/ fs/ | +5 | 0 replies | |
| 6/11 | btrfs: pass the extent buffer for the btrfs_item_nr helpersfs/ fs/ fs/ +1 more | +30 | 0 replies | |
| 7/11 | btrfs: add eb to btrfs_node_key_ptr_offsetfs/ fs/ fs/ +2 more | +20 | 0 replies | |
| 8/11 | btrfs: add helpers for manipulating leaf items and datafs/ | +111 | 0 replies | |
| 9/11 | btrfs: remove BTRFS_LEAF_DATA_OFFSETfs/ fs/ fs/ | +7 | 0 replies | |
| 10/11 | btrfs: add nr_global_roots to the super block definitionfs/ include/ | +4 | 0 replies | |
| 11/11 | btrfs: add stack helpers for a few btrfs itemsfs/ | +37 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 00/11] btrfs: a variety of header file cleanups
Hello,
While syncing accessors.[ch] I ran into a variety of oddities between what we do in the kernel vs what we do in btrfs-progs. Some of these things are just differently named helpers, some are helpers we need in progs but don't have in the kernel, and some of these are extent tree v2 stuff that was done in btrfs-progs but not yet merged into the kernel. I kept the v2 stuff very simple, it's mostly just updating helpers to take an extent_buffer.
Additionally I cleaned up how we do leaf manipulation, because those helpers are a little wonky and you have to understand how the leaves are laid out. I'm not in love with what I came up with, but it makes the code a little cleaner, and then it made the cleanups easier as there are only 4 sites that needed to be updated instead of 32.
I made these changes in tandem with the btrfs-progs sync of accessors.[ch], and then sync'ed the copy based on these changes. I can obviously update them both if there are changes required, but this is why the accessors.h looks different in my btrfs-progs patchset, because it's actually a copy of that file with these changes applied. Thanks,
Josef
Josef Bacik (11):
btrfs: move root helpers back into ctree.h
btrfs: move leaf_data_end into ctree.c
btrfs: move file_extent_item helpers into file-item.h
btrfs: move eb offset helpers into extent_io.h
btrfs: move the csum helpers into ctree.h
btrfs: pass the extent buffer for the btrfs_item_nr helpers
btrfs: add eb to btrfs_node_key_ptr_offset
btrfs: add helpers for manipulating leaf items and data
btrfs: remove BTRFS_LEAF_DATA_OFFSET
btrfs: add nr_global_roots to the super block definition
btrfs: add stack helpers for a few btrfs items
fs/btrfs/accessors.c | 2 +- fs/btrfs/accessors.h | 124 ++++++++---------- fs/btrfs/ctree.c | 218 ++++++++++++++++++++------------ fs/btrfs/ctree.h | 63 ++++----- fs/btrfs/extent_io.c | 10 +- fs/btrfs/extent_io.h | 33 +++++ fs/btrfs/file-item.h | 34 +++++ fs/btrfs/tree-checker.c | 5 +- fs/btrfs/tree-mod-log.c | 4 +- include/uapi/linux/btrfs_tree.h | 3 +- 10 files changed, 295 insertions(+), 201 deletions(-)
Signature · 1 line
2.26.3