Skip to contentSkip to conversation

erofs fixes for 6.5-rc5

GIT PULL Merged Gao Xiang 2 participants 2 messages Aug 3, 2023

lore
Share & tools
lore

Gao Xiang

author
#0 lore raw

Hi Linus,

Sorry about another pull due to new reports this cycle, but could you consider these two patches for 6.5-rc5?

One patch addresses a data corruption of compressed data deduplication reported by Shijie Sun who is using this feature in their products.

The other one actually drops a useless WARN_ON() in erofs_kill_sb(). Since the commit is trivial and the WARN_ON() was actually broken in the -next tree (and triggered a syzbot report) due to a behavior change of .kill_sb() for the next cycle, it'd be better to fix it upstream now.

All commits have been in -next for a while and no potential merge conflict is observed.

Thanks,
Gao Xiang

The following changes since commit 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4:

Linux 6.5-rc4 (2023-07-30 13:23:47 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.5-rc5-fixes

for you to fetch changes up to 4da3c7183e186afe8196160f16d5a0248a24e45d:

erofs: drop unnecessary WARN_ON() in erofs_kill_sb() (2023-08-01 16:12:24 +0800)

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

- Fix data corruption caused by insufficient decompression on deduplicated compressed extents;

- Drop a useless s_magic checking in erofs_kill_sb().

----------------------------------------------------------------
Gao Xiang (2):
erofs: fix wrong primary bvec selection on deduplicated extents
erofs: drop unnecessary WARN_ON() in erofs_kill_sb()

 fs/erofs/super.c | 2 --
 fs/erofs/zdata.c | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 3 Aug 2023 22:50:19 +0800:

The pull request you sent on Thu, 3 Aug 2023 22:50:19 +0800:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.5-rc5-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/556c9424e271abff7ada9196007418f7b8431c6e

Thank you!

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