[00/12] btrfs: various cleanups to make ctree.c sync easier

Message

Josef Bacik April 29, 2023, 8:07 p.m. UTC

Hello,

These are various cleanups I needed to make syncing some of the kernel files
into btrfs-progs go smoothly.  They're cosmetic and organizational and shouldn't
have any functional changes.  Thanks,

Josef

Josef Bacik (12):
  btrfs: move btrfs_check_trunc_cache_free_space into block-rsv.c
  btrfs: remove level argument from btrfs_set_block_flags
  btrfs: simplify btrfs_check_leaf_* helpers into a single helper
  btrfs: add btrfs_tree_block_status definitions to tree-checker.h
  btrfs: use btrfs_tree_block_status for leaf item errors
  btrfs: extend btrfs_leaf_check to return btrfs_tree_block_status
  btrfs: add __btrfs_check_node helper
  btrfs: move btrfs_verify_level_key into tree-checker.c
  btrfs: move split_flags/combine_flags helpers to inode-item.h
  btrfs: add __KERNEL__ check for btrfs_no_printk
  btrfs: add a btrfs_csum_type_size helper
  btrfs: rename del_ptr -> btrfs_del_ptr and export it

 fs/btrfs/block-rsv.c        |  19 +++++
 fs/btrfs/block-rsv.h        |   2 +
 fs/btrfs/btrfs_inode.h      |  16 ----
 fs/btrfs/ctree.c            |  29 ++++---
 fs/btrfs/ctree.h            |   3 +
 fs/btrfs/disk-io.c          |  70 ++--------------
 fs/btrfs/disk-io.h          |   2 -
 fs/btrfs/extent-tree.c      |   7 +-
 fs/btrfs/extent-tree.h      |   2 +-
 fs/btrfs/free-space-cache.c |  19 -----
 fs/btrfs/free-space-cache.h |   2 -
 fs/btrfs/inode-item.h       |  16 ++++
 fs/btrfs/messages.h         |   7 ++
 fs/btrfs/tree-checker.c     | 157 ++++++++++++++++++++++++++----------
 fs/btrfs/tree-checker.h     |  29 ++++---
 15 files changed, 207 insertions(+), 173 deletions(-)

Comments

David Sterba May 9, 2023, 10:10 p.m. UTC | #1

On Sat, Apr 29, 2023 at 04:07:09PM -0400, Josef Bacik wrote:
> Hello,
> 
> These are various cleanups I needed to make syncing some of the kernel files
> into btrfs-progs go smoothly.  They're cosmetic and organizational and shouldn't
> have any functional changes.  Thanks,
> 
> Josef
> 
> Josef Bacik (12):
>   btrfs: move btrfs_check_trunc_cache_free_space into block-rsv.c
>   btrfs: remove level argument from btrfs_set_block_flags
>   btrfs: simplify btrfs_check_leaf_* helpers into a single helper
>   btrfs: add btrfs_tree_block_status definitions to tree-checker.h
>   btrfs: use btrfs_tree_block_status for leaf item errors
>   btrfs: extend btrfs_leaf_check to return btrfs_tree_block_status
>   btrfs: add __btrfs_check_node helper
>   btrfs: move btrfs_verify_level_key into tree-checker.c
>   btrfs: move split_flags/combine_flags helpers to inode-item.h
>   btrfs: add __KERNEL__ check for btrfs_no_printk
>   btrfs: add a btrfs_csum_type_size helper
>   btrfs: rename del_ptr -> btrfs_del_ptr and export it

Added to misc-next, thanks. There are still some comments regarding the
ifdefs and export macros, we can deal with that after merge or I can
update the patches as needed.