From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v2 00/18] btrfs-progs: prep and initial sync of kernel code
Date: Tue, 15 Nov 2022 10:31:09 -0500 [thread overview]
Message-ID: <cover.1668526161.git.josef@toxicpanda.com> (raw)
v1->v2:
- Updated a couple other qgroup helpers that I missed.
- Added a macro for KERN_WARNING that I missed.
- A couple of cleanups to enable accessors.[ch] to be sync'ed easier.
- Sync'ing accessors.[ch] as well.
--- Original email ----
Hello,
In order to make my extent tree v2 work easier I need to sync the kernel code
into btrfs-progs. We haven't done this in a while, and really I want to move
towards doing this every release. Unfortunately because we haven't done this in
a while it's going to be a little messy. This is the first patch of patches,
which is mostly prep work, and then syncing the easiest parts of the kernel that
I could manage.
I've almost got accessors.[ch] done, however it requires doing some cleanups and
moving around in the kernel to make it smooth and easy, and I wasn't able to get
those done fast enough this week.
I've taken the approach of marking functions that I have to change things with
/*
* MODIFIED:
* - List of things I changed.
*/
Some of these I did because btrfs-progs simply does things differently. Some of
these were done because they have dependencies from other things in the kernel
sources, and it was simpler to just change it for now, get everything sync'ed,
and then go back and clean things up after the fact.
I've tried to make this as painless as possible, but it's just a painful
operation. That being said if I've done something in a way that is confusing
or just too complicated please point it out to me and I can try alternative
strategies. Thanks,
Josef
Josef Bacik (18):
btrfs-progs: turn on more compiler warnings and use -Wall
btrfs-progs: properly test for send_stream_version
btrfs-progs: use -std=gnu11
btrfs-progs: move btrfs_err_str into common/utils.h
btrfs-progs: rename qgroup items to match the kernel naming scheme
btrfs-progs: make btrfs_qgroup_level helper match the kernel
btrfs-progs: move NO_RESULT definition into replace.c
btrfs-progs: rename BLOCK_* to IMAGE_BLOCK_* for metadump
btrfs-progs: rename btrfs_item_end to btrfs_item_data_end
btrfs-progs: sync uapi/btrfs.h into btrfs-progs
btrfs: stop using btrfs_root_item_v0
btrfs-progs: sync ondisk definitions from the kernel
btrfs-progs: sync compression.h from the kernel
btrfs-progs: sync messages.* from the kernel
btrfs-progs: replace btrfs_leaf_data with btrfs_item_nr_offset
btrfs-progs: don't use btrfs_header_csum helper
btrfs-progs: make write_extent_buffer take a const eb
btrfs-progs: sync accessors.[ch] from the kernel
Makefile | 7 +-
btrfs-corrupt-block.c | 5 +-
btrfs-fragments.c | 2 +-
btrfstune.c | 3 +-
check/clear-cache.c | 1 +
check/main.c | 23 +-
check/mode-common.c | 6 +-
check/mode-lowmem.c | 8 +-
check/qgroup-verify.c | 66 +-
cmds/balance.c | 2 +-
cmds/device.c | 2 +-
cmds/filesystem-du.c | 1 +
cmds/filesystem-usage.c | 1 +
cmds/filesystem-usage.h | 2 +-
cmds/filesystem.c | 3 +-
cmds/inspect.c | 2 +-
cmds/property.c | 2 +-
cmds/qgroup.c | 76 +-
cmds/qgroup.h | 10 +-
cmds/quota.c | 2 +-
cmds/receive.c | 2 +-
cmds/replace.c | 5 +-
cmds/rescue-chunk-recover.c | 6 +-
cmds/rescue.c | 1 +
cmds/restore.c | 5 +-
cmds/scrub.c | 2 +-
cmds/send.c | 2 +-
cmds/subvolume-list.c | 7 +-
cmds/subvolume.c | 14 +-
common/device-scan.c | 2 +-
common/device-scan.h | 2 +-
common/fsfeatures.c | 2 +-
common/parse-utils.c | 1 +
common/send-stream.c | 2 +-
common/send-utils.c | 2 +-
common/units.c | 1 +
common/utils.c | 2 +-
common/utils.h | 34 +-
convert/common.c | 3 +-
convert/source-ext2.c | 1 +
image/main.c | 53 +-
image/metadump.h | 6 +-
kerncompat.h | 69 +-
kernel-shared/accessors.c | 117 ++
kernel-shared/accessors.h | 1087 ++++++++++
kernel-shared/backref.c | 1 +
kernel-shared/compression.h | 184 ++
kernel-shared/ctree.c | 62 +-
kernel-shared/ctree.h | 1849 +----------------
kernel-shared/delayed-ref.c | 1 +
kernel-shared/dir-item.c | 8 +-
kernel-shared/extent_io.c | 5 +-
kernel-shared/extent_io.h | 2 +-
kernel-shared/file.c | 1 +
kernel-shared/free-space-tree.c | 1 +
kernel-shared/inode.c | 2 +-
kernel-shared/messages.c | 372 ++++
kernel-shared/messages.h | 253 +++
kernel-shared/print-tree.c | 39 +-
kernel-shared/transaction.c | 5 -
kernel-shared/transaction.h | 1 -
ioctl.h => kernel-shared/uapi/btrfs.h | 644 +++---
kernel-shared/uapi/btrfs_tree.h | 1259 +++++++++++
kernel-shared/ulist.c | 1 +
kernel-shared/zoned.h | 1 +
libbtrfs/ctree.h | 19 +-
libbtrfs/send-utils.c | 2 +-
libbtrfsutil/btrfs_tree.h | 2 +-
mkfs/common.c | 3 +-
mkfs/main.c | 1 +
tests/ioctl-test.c | 2 +-
tests/library-test.c | 2 +-
.../053-receive-write-encoded/test.sh | 2 +-
73 files changed, 3984 insertions(+), 2392 deletions(-)
create mode 100644 kernel-shared/accessors.c
create mode 100644 kernel-shared/accessors.h
create mode 100644 kernel-shared/compression.h
create mode 100644 kernel-shared/messages.c
create mode 100644 kernel-shared/messages.h
rename ioctl.h => kernel-shared/uapi/btrfs.h (70%)
create mode 100644 kernel-shared/uapi/btrfs_tree.h
--
2.26.3
next reply other threads:[~2022-11-15 15:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 15:31 Josef Bacik [this message]
2022-11-15 15:31 ` [PATCH v2 01/18] btrfs-progs: turn on more compiler warnings and use -Wall Josef Bacik
2022-11-15 15:31 ` [PATCH v2 02/18] btrfs-progs: properly test for send_stream_version Josef Bacik
2022-11-15 15:31 ` [PATCH v2 03/18] btrfs-progs: use -std=gnu11 Josef Bacik
2022-11-15 15:31 ` [PATCH v2 04/18] btrfs-progs: move btrfs_err_str into common/utils.h Josef Bacik
2022-11-15 15:31 ` [PATCH v2 05/18] btrfs-progs: rename qgroup items to match the kernel naming scheme Josef Bacik
2022-11-15 15:31 ` [PATCH v2 06/18] btrfs-progs: make btrfs_qgroup_level helper match the kernel Josef Bacik
2022-11-15 15:31 ` [PATCH v2 07/18] btrfs-progs: move NO_RESULT definition into replace.c Josef Bacik
2022-11-15 15:31 ` [PATCH v2 08/18] btrfs-progs: rename BLOCK_* to IMAGE_BLOCK_* for metadump Josef Bacik
2022-11-15 15:31 ` [PATCH v2 09/18] btrfs-progs: rename btrfs_item_end to btrfs_item_data_end Josef Bacik
2022-11-15 15:31 ` [PATCH v2 10/18] btrfs-progs: sync uapi/btrfs.h into btrfs-progs Josef Bacik
2022-11-15 15:31 ` [PATCH v2 11/18] btrfs: stop using btrfs_root_item_v0 Josef Bacik
2022-11-15 15:31 ` [PATCH v2 12/18] btrfs-progs: sync ondisk definitions from the kernel Josef Bacik
2022-11-15 15:31 ` [PATCH v2 13/18] btrfs-progs: sync compression.h " Josef Bacik
2022-11-15 15:31 ` [PATCH v2 14/18] btrfs-progs: sync messages.* " Josef Bacik
2022-11-15 15:31 ` [PATCH v2 15/18] btrfs-progs: replace btrfs_leaf_data with btrfs_item_nr_offset Josef Bacik
2022-11-15 15:31 ` [PATCH v2 16/18] btrfs-progs: don't use btrfs_header_csum helper Josef Bacik
2022-11-15 15:31 ` [PATCH v2 17/18] btrfs-progs: make write_extent_buffer take a const eb Josef Bacik
2022-11-15 15:31 ` [PATCH v2 18/18] btrfs-progs: sync accessors.[ch] from the kernel Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1668526161.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox