Skip to content

btrfs: ctree.[ch] cleanups

Josef Bacik linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest12 patches 4 repliesIn review
  2. v111 patches 16 repliesSuperseded

Changes in v2 from the cover letter

- added "btrfs: include linux/security.h in super.c" to deal with a compile error after removing it from ctree.h in certain configs.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/12btrfs: move btrfs_crc32c_final into free-space-cache.cfs/btrfs/ctree.h fs/btrfs/free-space-cache.c+5 -50 replies
2/12btrfs: remove btrfs_crc32c wrapperfs/btrfs/ctree.h fs/btrfs/extent-tree.c fs/btrfs/free-space-cache.c +1 more+8 -130 replies
3/12btrfs: move btrfs_extref_hash into inode-item.hfs/btrfs/ctree.h fs/btrfs/inode-item.h+9 -90 replies
4/12btrfs: move btrfs_name_hash to dir-item.hfs/btrfs/ctree.h fs/btrfs/dir-item.h fs/btrfs/props.c +1 more+7 -50 replies
5/12btrfs: include asm/unaligned.h in accessors.hfs/btrfs/accessors.h+1 -00 replies
6/12btrfs: include linux/crc32c in dir-item and inode-itemfs/btrfs/dir-item.h fs/btrfs/inode-item.h+3 -00 replies
7/12btrfs: include linux/iomap.h in file.cfs/btrfs/file.c+1 -00 replies
8/12btrfs: add fscrypt related dependencies to respective headersfs/btrfs/btrfs_inode.h fs/btrfs/dir-item.h fs/btrfs/inode-item.h +1 more+6 -00 replies
9/12btrfs: add btrfs_delayed_ref_head declaration to extent-tree.hfs/btrfs/extent-tree.h+1 -00 replies
10/12btrfs: include trace header in where necessaryfs/btrfs/async-thread.c fs/btrfs/btrfs_inode.h fs/btrfs/locking.c +1 more+4 -00 replies
11/12btrfs: include linux/security.h in super.cfs/btrfs/super.c+1 -00 replies
12/12btrfs: remove extraneous includes from ctree.hfs/btrfs/ctree.h+0 -281 reply

Reviews trailers per patch

None of the 12 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJohannes Thumshirn
SeriesR-b
1/12
2/12
3/12
4/12
5/12
6/12
7/12
8/12
9/12
10/12
11/12
12/12

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/12] btrfs: ctree.[ch] cleanups

v1->v2:
- added "btrfs: include linux/security.h in super.c" to deal with a compile error after removing it from ctree.h in certain configs.

--- Original email ---
Hello,

While refreshing my ctree sync patches for btrfs-progs I ran into some oddness around our crc32c related helpers that made the sync awkward. This moves those helpers around to other locations to make it easier to sync ctree.c into btrfs-progs.

I also got a little distracted by the massive amount of includes we have in ctree.h, so I moved code around to trim this down to the bare minimum we need currently.

There's no functional change here, just moving things about and renaming things. Thanks,

Josef

Josef Bacik (12):
btrfs: move btrfs_crc32c_final into free-space-cache.c
btrfs: remove btrfs_crc32c wrapper
btrfs: move btrfs_extref_hash into inode-item.h
btrfs: move btrfs_name_hash to dir-item.h
btrfs: include asm/unaligned.h in accessors.h
btrfs: include linux/crc32c in dir-item and inode-item
btrfs: include linux/iomap.h in file.c
btrfs: add fscrypt related dependencies to respective headers
btrfs: add btrfs_delayed_ref_head declaration to extent-tree.h
btrfs: include trace header in where necessary
btrfs: include linux/security.h in super.c
btrfs: remove extraneous includes from ctree.h

 fs/btrfs/accessors.h        |  1 +
 fs/btrfs/async-thread.c     |  1 +
 fs/btrfs/btrfs_inode.h      |  2 ++
 fs/btrfs/ctree.h            | 52 -------------------------------------
 fs/btrfs/dir-item.h         |  9 +++++++
 fs/btrfs/extent-tree.c      |  6 ++---
 fs/btrfs/extent-tree.h      |  1 +
 fs/btrfs/file.c             |  1 +
 fs/btrfs/free-space-cache.c |  9 +++++--
 fs/btrfs/inode-item.h       | 11 ++++++++
 fs/btrfs/locking.c          |  1 +
 fs/btrfs/props.c            |  1 +
 fs/btrfs/root-tree.h        |  2 ++
 fs/btrfs/send.c             |  6 ++---
 fs/btrfs/space-info.h       |  1 +
 fs/btrfs/super.c            |  1 +
 fs/btrfs/tree-checker.c     |  1 +
 17 files changed, 46 insertions(+), 60 deletions(-)
Signature · 1 line
2.41.0