[00/11] btrfs-progs: prep work for syncing files into kernel-shared

Message

Josef Bacik April 19, 2023, 9:13 p.m. UTC

Hello,

These a variety of fixes, cleanups, and api changes to make it easier to sync
recent kernel changes into btrfs-progs.  They're relatively straightforward, and
have been run through the tests.  Thanks,

Josef

Josef Bacik (11):
  btrfs-progs: fix kerncompat.h include ordering for libbtrfs
  btrfs-progs: use $SUDO_HELPER in convert tests for temp files
  btrfs-progs: re-add __init to include/kerncompat.h
  btrfs-progs: introduce UASSERT() for purely userspace code
  btrfs-progs: move BTRFS_DISABLE_BACKTRACE check in print_trace
  btrfs-progs: remove the _on() related message helpers
  btrfs-progs: consolidate the btrfs message helpers
  btrfs-progs: rename the qgroup structs to match the kernel
  btrfs-progs: remove fs_info argument from btrfs_check_* helpers
  btrfs-progs: add a btrfs check helper for checking blocks
  btrfs-progs: remove parent_key arg from btrfs_check_* helpers

 check/clear-cache.c         |  4 +-
 check/main.c                | 26 ++++-------
 check/mode-common.c         | 12 ++---
 check/mode-lowmem.c         | 31 ++++++-------
 check/qgroup-verify.c       | 16 +++----
 check/repair.c              | 29 ++++++++++++
 check/repair.h              |  3 +-
 cmds/filesystem-du.c        |  2 +-
 cmds/filesystem-usage.c     |  6 +--
 cmds/qgroup.c               | 42 ++++++++----------
 cmds/replace.c              |  4 +-
 cmds/rescue-chunk-recover.c |  6 +--
 cmds/rescue.c               |  4 +-
 cmds/subvolume-list.c       | 20 ++++-----
 common/device-utils.c       |  4 +-
 common/messages.c           | 69 +----------------------------
 common/messages.h           | 56 ++++++++++++++---------
 common/units.c              |  4 +-
 convert/common.c            |  4 +-
 convert/main.c              |  2 +-
 image/main.c                |  2 +-
 include/kerncompat.h        | 14 ++----
 kernel-shared/ctree.c       | 43 ++++--------------
 kernel-shared/ctree.h       | 88 ++++++++++++++++++-------------------
 kernel-shared/disk-io.c     |  4 +-
 kernel-shared/print-tree.c  | 18 ++++----
 libbtrfs/ctree.h            |  4 +-
 libbtrfs/send-stream.c      |  3 +-
 libbtrfs/send-utils.c       |  2 +-
 mkfs/main.c                 |  4 +-
 tests/common.convert        | 16 +++----
 31 files changed, 231 insertions(+), 311 deletions(-)

Comments

David Sterba May 2, 2023, 8:56 p.m. UTC | #1

On Wed, Apr 19, 2023 at 05:13:42PM -0400, Josef Bacik wrote:
> Hello,
> 
> These a variety of fixes, cleanups, and api changes to make it easier to sync
> recent kernel changes into btrfs-progs.  They're relatively straightforward, and
> have been run through the tests.  Thanks,
> 
> Josef
> 
> Josef Bacik (11):
>   btrfs-progs: fix kerncompat.h include ordering for libbtrfs
>   btrfs-progs: use $SUDO_HELPER in convert tests for temp files
>   btrfs-progs: re-add __init to include/kerncompat.h
>   btrfs-progs: introduce UASSERT() for purely userspace code
>   btrfs-progs: move BTRFS_DISABLE_BACKTRACE check in print_trace
>   btrfs-progs: remove the _on() related message helpers
>   btrfs-progs: consolidate the btrfs message helpers
>   btrfs-progs: rename the qgroup structs to match the kernel
>   btrfs-progs: remove fs_info argument from btrfs_check_* helpers
>   btrfs-progs: add a btrfs check helper for checking blocks
>   btrfs-progs: remove parent_key arg from btrfs_check_* helpers

Added to devel, with some minor adjustments, thanks.