Skip to content

btrfs: final ctree.h cleanups

Josef Bacik linux-btrfs llvm oe-kbuild-all 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest26 patches 29 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/26btrfs: convert discard stat defs to enumfs/btrfs/free-space-cache.h+5 -31 reply
2/26btrfs: move btrfs_chunk_item_size out of ctree.hfs/btrfs/ctree.h fs/btrfs/volumes.h+9 -72 replies
3/26btrfs: add dependencies to fs.h and block-rsv.hfs/btrfs/block-rsv.h fs/btrfs/fs.h+9 -01 reply
4/26btrfs: add blk_types.h include to compression.hfs/btrfs/compression.h+1 -01 reply
5/26btrfs: move the printk and assert helpers to messages.cfs/btrfs/Makefile fs/btrfs/messages.c fs/btrfs/super.c+353 -3473 replies
6/26btrfs: move inode prototypes to btrfs_inode.hfs/btrfs/btrfs_inode.h fs/btrfs/ctree.h+137 -1371 reply
7/26btrfs: rename tree-defrag.c to defrag.cfs/btrfs/Makefile fs/btrfs/defrag.c+1 -11 reply
8/26btrfs: move the auto defrag code to defrag.cfs/btrfs/defrag.c fs/btrfs/file.c+340 -3401 reply
9/26btrfs: move the file defrag code into defrag.cfs/btrfs/defrag.c fs/btrfs/ioctl.c+905 -9021 reply
10/26btrfs: move defrag related prototypes to their own headerfs/btrfs/ctree.h fs/btrfs/defrag.c fs/btrfs/defrag.h +5 more+29 -181 reply
11/26btrfs: move dir-item prototypes into dir-item.hfs/btrfs/ctree.h fs/btrfs/dir-item.c fs/btrfs/dir-item.h +7 more+51 -381 reply
12/26btrfs: move file-item prototypes into their own headerfs/btrfs/compression.c fs/btrfs/ctree.h fs/btrfs/defrag.c +14 more+50 -301 reply
13/26btrfs: move uuid tree prototypes to uuid-tree.hfs/btrfs/ctree.h fs/btrfs/disk-io.c fs/btrfs/inode.c +5 more+18 -71 reply
14/26btrfs: move ioctl prototypes into ioctl.hfs/btrfs/ctree.h fs/btrfs/file.c fs/btrfs/inode.c +7 more+25 -121 reply
15/26btrfs: move file prototypes to file.hfs/btrfs/ctree.h fs/btrfs/extent_io.c fs/btrfs/file.c +7 more+39 -261 reply
16/26btrfs: move the 32bit warn defines into messages.hfs/btrfs/ctree.h fs/btrfs/messages.h+13 -131 reply
17/26btrfs: move the snapshot drop related prototypes to extent-tree.hfs/btrfs/ctree.h fs/btrfs/extent-tree.h+6 -61 reply
18/26btrfs: move acl prototypes into acl.hfs/btrfs/acl.c fs/btrfs/acl.h fs/btrfs/ctree.h +1 more+25 -181 reply
19/26btrfs: move relocation prototypes into relocation.hfs/btrfs/backref.c fs/btrfs/ctree.c fs/btrfs/ctree.h +6 more+32 -201 reply
20/26btrfs: move scrub prototypes into scrub.hfs/btrfs/ctree.h fs/btrfs/dev-replace.c fs/btrfs/disk-io.c +6 more+23 -111 reply
21/26btrfs: move dev-replace prototypes into dev-replace.hfs/btrfs/ctree.h fs/btrfs/dev-replace.h fs/btrfs/extent_io.c+9 -91 reply
22/26btrfs: move verity prototypes into verity.hfs/btrfs/ctree.h fs/btrfs/inode.c fs/btrfs/send.c +3 more+31 -221 reply
23/26btrfs: move CONFIG_BTRFS_FS_RUN_SANITY_TESTS checks to fs.hfs/btrfs/ctree.h fs/btrfs/fs.h+9 -161 reply
24/26btrfs: move super prototypes into super.hfs/btrfs/ctree.h fs/btrfs/disk-io.c fs/btrfs/ioctl.c +2 more+15 -71 reply
25/26btrfs: move super_block specific helpers into super.hfs/btrfs/compression.c fs/btrfs/defrag.c fs/btrfs/export.c +14 more+32 -171 reply
26/26btrfs: move orphan prototypes into orphan.hfs/btrfs/ctree.h fs/btrfs/extent-tree.c fs/btrfs/inode.c +4 more+16 -61 reply

Reviews trailers per patch

24 of 26 patches have a Reviewed-by or Acked-by.

PatchJohannes ThumshirnAnand Jain
1/26R-b
2/26
3/26R-b
4/26R-b
5/26R-b
6/26R-b
7/26R-b
8/26R-b
9/26R-b
10/26R-b
11/26R-b
12/26R-b
13/26R-b
14/26R-b
15/26R-b
16/26R-b
17/26R-b
18/26R-b
19/26R-b
20/26R-b
21/26R-b
22/26R-b
23/26R-b
24/26R-b
25/26R-b
26/26

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

Read the v1 thread

Cover letter [PATCH 00/26] btrfs: final ctree.h cleanups

Hello,

This is the last bit to cleanup ctree.h. There bulk of this is moving the prototypes into their own headers, so yes this explodes out the number of files we have. I've also moved messages stuff into messages.c, as when I started the work to sync stuff to btrfs-progs I realized it's kind of annoying having that code bundled up with other things, so having it separate will make it easier to deal with that stuff on it's own.

I've also left btrfs_root in ctree.h. I really, really want to cleanup disk-io.c, and so I'm holding off moving btrfs_root until I do the disk-io.c cleanup, hopefully there will be a logical place to move that struct once I've done that cleanup.

This is the last batch of cleanups for this cycle hopefully. I may have some smaller things as I start trying to sync btrfs-progs, but this is the last big terrible splitting for now. Thanks,

Josef

Josef Bacik (26):
btrfs: convert discard stat defs to enum
btrfs: move btrfs_chunk_item_size out of ctree.h
btrfs: add dependencies to fs.h and block-rsv.h
btrfs: add blk_types.h include to compression.h
btrfs: move the printk and assert helpers to messages.c
btrfs: move inode prototypes to btrfs_inode.h
btrfs: rename tree-defrag.c to defrag.c
btrfs: move the auto defrag code to defrag.c
btrfs: move the file defrag code into defrag.c
btrfs: move defrag related prototypes to their own header
btrfs: move dir-item prototypes into dir-item.h
btrfs: move file-item prototypes into their own header
btrfs: move uuid tree prototypes to uuid-tree.h
btrfs: move ioctl prototypes into ioctl.h
btrfs: move file prototypes to file.h
btrfs: move the 32bit warn defines into messages.h
btrfs: move the snapshot drop related prototypes to extent-tree.h
btrfs: move acl prototypes into acl.h
btrfs: move relocation prototypes into relocation.h
btrfs: move scrub prototypes into scrub.h
btrfs: move dev-replace prototypes into dev-replace.h
btrfs: move verity prototypes into verity.h
btrfs: move CONFIG_BTRFS_FS_RUN_SANITY_TESTS checks to fs.h
btrfs: move super prototypes into super.h
btrfs: move super_block specific helpers into super.h
btrfs: move orphan prototypes into orphan.h

 fs/btrfs/Makefile           |    4 +-
 fs/btrfs/acl.c              |    1 +
 fs/btrfs/acl.h              |   23 +
 fs/btrfs/backref.c          |    1 +
 fs/btrfs/block-rsv.h        |    1 +
 fs/btrfs/btrfs_inode.h      |  137 ++++
 fs/btrfs/compression.c      |    2 +
 fs/btrfs/compression.h      |    1 +
 fs/btrfs/ctree.c            |    1 +
 fs/btrfs/ctree.h            |  402 ----------
 fs/btrfs/defrag.c           | 1381 +++++++++++++++++++++++++++++++++++
 fs/btrfs/defrag.h           |   23 +
 fs/btrfs/delayed-inode.c    |    1 +
 fs/btrfs/dev-replace.c      |    1 +
 fs/btrfs/dev-replace.h      |    8 +
 fs/btrfs/dir-item.c         |    1 +
 fs/btrfs/dir-item.h         |   43 ++
 fs/btrfs/disk-io.c          |    5 +
 fs/btrfs/export.c           |    1 +
 fs/btrfs/extent-tree.c      |    2 +
 fs/btrfs/extent-tree.h      |    6 +
 fs/btrfs/extent_io.c        |    4 +
 fs/btrfs/file-item.c        |    2 +
 fs/btrfs/file-item.h        |   35 +
 fs/btrfs/file.c             |  344 +--------
 fs/btrfs/file.h             |   31 +
 fs/btrfs/free-space-cache.c |    3 +
 fs/btrfs/free-space-cache.h |    8 +-
 fs/btrfs/fs.h               |   35 +-
 fs/btrfs/inode-item.c       |    1 +
 fs/btrfs/inode.c            |   11 +
 fs/btrfs/ioctl.c            |  909 +----------------------
 fs/btrfs/ioctl.h            |   17 +
 fs/btrfs/lzo.c              |    1 +
 fs/btrfs/messages.c         |  353 +++++++++
 fs/btrfs/messages.h         |   13 +
 fs/btrfs/ordered-data.c     |    2 +
 fs/btrfs/orphan.h           |   11 +
 fs/btrfs/props.c            |    1 +
 fs/btrfs/reflink.c          |    3 +
 fs/btrfs/relocation.c       |    3 +
 fs/btrfs/relocation.h       |   25 +
 fs/btrfs/root-tree.c        |    1 +
 fs/btrfs/scrub.c            |    2 +
 fs/btrfs/scrub.h            |   16 +
 fs/btrfs/send.c             |    4 +
 fs/btrfs/super.c            |  352 +--------
 fs/btrfs/super.h            |   29 +
 fs/btrfs/transaction.c      |    6 +
 fs/btrfs/tree-defrag.c      |  133 ----
 fs/btrfs/tree-log.c         |    4 +
 fs/btrfs/uuid-tree.c        |    1 +
 fs/btrfs/uuid-tree.h        |   12 +
 fs/btrfs/verity.c           |    3 +
 fs/btrfs/verity.h           |   27 +
 fs/btrfs/volumes.c          |    5 +
 fs/btrfs/volumes.h          |    9 +
 fs/btrfs/xattr.c            |    1 +
 58 files changed, 2316 insertions(+), 2146 deletions(-)
 create mode 100644 fs/btrfs/acl.h
 create mode 100644 fs/btrfs/defrag.c
 create mode 100644 fs/btrfs/defrag.h
 create mode 100644 fs/btrfs/dir-item.h
 create mode 100644 fs/btrfs/file-item.h
 create mode 100644 fs/btrfs/file.h
 create mode 100644 fs/btrfs/ioctl.h
 create mode 100644 fs/btrfs/messages.c
 create mode 100644 fs/btrfs/orphan.h
 create mode 100644 fs/btrfs/relocation.h
 create mode 100644 fs/btrfs/scrub.h
 create mode 100644 fs/btrfs/super.h
 delete mode 100644 fs/btrfs/tree-defrag.c
 create mode 100644 fs/btrfs/uuid-tree.h
 create mode 100644 fs/btrfs/verity.h
Signature · 1 line
2.26.3