Skip to contentSkip to conversation

erofs updates for 6.19-rc1

GIT PULL Merged Gao Xiang 2 participants 2 messages Dec 1, 2025 – Dec 4, 2025

lore
Share & tools
lore

Gao Xiang

author
#0 lore raw

Hi Linus,

Could you consider this pull request for 6.19-rc1?

There is still no outstanding feature for this cycle since page cache sharing feature is still under review.

All commits have been in -next except for the obvious license change one and no potential merge conflict is observed.

Thanks,
Gao Xiang

The following changes since commit 6a23ae0a96a600d1d12557add110e0bb6e32730c:

Linux 6.18-rc6 (2025-11-16 14:25:38 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.19-rc1

for you to fetch changes up to 0bdbf89a8bbeb155644b69dc2d071a1ce23414f8:

erofs: switch on-disk header erofs_fs.h to MIT license (2025-12-01 15:25:43 +0800)

----------------------------------------------------------------
Changes since last update:

- Fix a WARNING caused by a recent FSDAX misdetection regression

- Fix the filesystem stacking limit for file-backed mounts

- Print more informative diagnostics on decompression errors

- Switch the on-disk definition erofs_fs.h to the MIT license

- Minor cleanups

----------------------------------------------------------------
Gao Xiang (9):
erofs: correct FSDAX detection
erofs: limit the level of fs stacking for file-backed mounts
erofs: tidy up z_erofs_lz4_handle_overlap()
erofs: improve decompression error reporting
erofs: improve Zstd, LZMA and DEFLATE error strings
erofs: enable error reporting for z_erofs_stream_switch_bufs()
erofs: enable error reporting for z_erofs_fixup_insize()
erofs: get rid of raw bi_end_io() usage
erofs: switch on-disk header erofs_fs.h to MIT license

 fs/erofs/compress.h             |  12 ++--
 fs/erofs/decompressor.c         | 149 ++++++++++++++++++++--------------------
 fs/erofs/decompressor_crypto.c  |   7 +-
 fs/erofs/decompressor_deflate.c |  37 +++++-----
 fs/erofs/decompressor_lzma.c    |  26 +++----
 fs/erofs/decompressor_zstd.c    |  28 ++++----
 fs/erofs/erofs_fs.h             |   2 +-
 fs/erofs/fileio.c               |   2 +-
 fs/erofs/fscache.c              |   4 +-
 fs/erofs/super.c                |  38 +++++++---
 fs/erofs/zdata.c                |  21 ++++--
 11 files changed, 178 insertions(+), 148 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 1 Dec 2025 19:46:30 +0800:

The pull request you sent on Mon, 1 Dec 2025 19:46:30 +0800:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.19-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/477e31fd1e81ef925ce55931bcdbf609ba2207c8

Thank you!

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