[0/9] btrfs: move btrfs_fs_info and some prototypes

Message

Josef Bacik Oct. 24, 2022, 6:46 p.m. UTC

Hello,

This is the next batch of ctree.h cleanups, and likely the last one for a little
bit.  The remaining prototypes in ctree.h are going to be touched by a lot of
work that's currently happening, and I don't want to mess with peoples work now
that we're getting into the development cycle a little bit.

The big thing I've done is moved btrfs_fs_info into fs.h.  This is relatively
painless at this poing since I've organized everything up to now so I can just
copy and paste the big chunk of it out of ctree.h into fs.h.

Then I've gone through and cleaned up a lot of randomm little things, and then
moved some prototypes into their own headers.

I stopped where we got to the name stuff, as I know the fscrypt stuff is going
to touch all of that.  I don't want to make that harder to merge, so I've
stopped here so that code can go in when it's ready, and then we can pick back
up cleaning up the rest of ctree.h.

The entirety of these changes are just code moving, there's been no functional
changing.  Thanks,

Josef

Josef Bacik (9):
  btrfs: move btrfs_fs_info declarations into fs.h
  btrfs: move the lockdep helpers into locking.h
  btrfs: minor whitespace in ctree.h
  btrfs: remove extra space info prototypes in ctree.h
  btrfs: move btrfs_account_ro_block_groups_free_space into space-info.c
  btrfs: move extent-tree helpers into their own header file
  btrfs: move delalloc space related prototypes to delalloc-space.h
  btrfs: delete unused function prototypes in ctree.h
  btrfs: move root tree prototypes to their own header

 fs/btrfs/backref.c         |   1 +
 fs/btrfs/block-group.c     |   1 +
 fs/btrfs/ctree.c           |   1 +
 fs/btrfs/ctree.h           | 854 +------------------------------------
 fs/btrfs/delalloc-space.h  |   3 +
 fs/btrfs/disk-io.c         |   2 +
 fs/btrfs/extent-tree.c     |  36 +-
 fs/btrfs/extent-tree.h     |  76 ++++
 fs/btrfs/file.c            |   1 +
 fs/btrfs/free-space-tree.c |   2 +
 fs/btrfs/fs.h              | 657 ++++++++++++++++++++++++++++
 fs/btrfs/inode-item.c      |   1 +
 fs/btrfs/inode.c           |   2 +
 fs/btrfs/ioctl.c           |   2 +
 fs/btrfs/locking.h         |  76 ++++
 fs/btrfs/qgroup.c          |   2 +
 fs/btrfs/relocation.c      |   2 +
 fs/btrfs/root-tree.c       |   1 +
 fs/btrfs/root-tree.h       |  36 ++
 fs/btrfs/space-info.c      |  35 ++
 fs/btrfs/space-info.h      |   1 +
 fs/btrfs/transaction.c     |   2 +
 fs/btrfs/tree-log.c        |   2 +
 23 files changed, 909 insertions(+), 887 deletions(-)
 create mode 100644 fs/btrfs/extent-tree.h
 create mode 100644 fs/btrfs/root-tree.h

Comments

David Sterba Oct. 25, 2022, 12:25 p.m. UTC | #1

On Mon, Oct 24, 2022 at 02:46:51PM -0400, Josef Bacik wrote:
> Hello,
> 
> This is the next batch of ctree.h cleanups, and likely the last one for a little
> bit.  The remaining prototypes in ctree.h are going to be touched by a lot of
> work that's currently happening, and I don't want to mess with peoples work now
> that we're getting into the development cycle a little bit.
> 
> The big thing I've done is moved btrfs_fs_info into fs.h.  This is relatively
> painless at this poing since I've organized everything up to now so I can just
> copy and paste the big chunk of it out of ctree.h into fs.h.
> 
> Then I've gone through and cleaned up a lot of randomm little things, and then
> moved some prototypes into their own headers.
> 
> I stopped where we got to the name stuff, as I know the fscrypt stuff is going
> to touch all of that.  I don't want to make that harder to merge, so I've
> stopped here so that code can go in when it's ready, and then we can pick back
> up cleaning up the rest of ctree.h.
> 
> The entirety of these changes are just code moving, there's been no functional
> changing.  Thanks,

Added to misc-next, thanks, there were only minor conflicts.