Skip to contentSkip to conversation

Btrfs fixes for 6.13-rc7

GIT PULL Merged David Sterba 2 participants 2 messages Jan 9, 2025 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

please pull a few more fixes. Besides the one-liners in Btrfs there's fix to the io_uring and encoded read integration (added in this development cycle). The update to io_uring provides more space for the ongoing command that is then used in Btrfs to handle some cases.

Please pull, thanks.

- io_uring and encoded read
- provide stable storage for io_uring command data
- make a copy of encoded read ioctl call, reuse that in case the call would block and will be called again

- properly initialize zlib context for hardware compression on s390

- fix max extent size calculation on filesystems with non-zoned devices

- fix crash in scrub on crafted image due to invalid extent tree

----------------------------------------------------------------
The following changes since commit fca432e73db2bec0fdbfbf6d98d3ebcd5388a977:

btrfs: sysfs: fix direct super block member reads (2024-12-23 22:06:44 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git tags/for-6.13-rc6-tag

for you to fetch changes up to 0ee4736c003daded513de0ff112d4a1e9c85bbab:

btrfs: zlib: fix avail_in bytes for s390 zlib HW compression path (2025-01-06 16:32:43 +0100)

----------------------------------------------------------------
Christoph Hellwig (1):
btrfs: zoned: calculate max_extent_size properly on non-zoned setup

Jens Axboe (2):
io_uring/cmd: rename struct uring_cache to io_uring_cmd_data io_uring/cmd: add per-op data to struct io_uring_cmd_data

Mark Harmstone (2):
io_uring: add io_uring_cmd_get_async_data helper
btrfs: don't read from userspace twice in btrfs_uring_encoded_read()

Mikhail Zaslonko (1):
btrfs: zlib: fix avail_in bytes for s390 zlib HW compression path

Qu Wenruo (1):
btrfs: avoid NULL pointer dereference if no valid extent tree

 fs/btrfs/ioctl.c             | 128 +++++++++++++++++++++++--------------------
 fs/btrfs/scrub.c             |   4 ++
 fs/btrfs/zlib.c              |   4 +-
 fs/btrfs/zoned.c             |   5 +-
 include/linux/io_uring/cmd.h |  10 ++++
 io_uring/io_uring.c          |   2 +-
 io_uring/opdef.c             |   3 +-
 io_uring/uring_cmd.c         |  23 +++++---
 io_uring/uring_cmd.h         |   4 --
 9 files changed, 106 insertions(+), 77 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 9 Jan 2025 17:42:55 +0100:

The pull request you sent on Thu, 9 Jan 2025 17:42:55 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git tags/for-6.13-rc6-tag

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/643e2e259c2b25a2af0ae4c23c6e16586d9fd19c

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html