Commit 556c9424 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs fixes from Gao Xiang:

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

 - Drop a useless s_magic checking in erofs_kill_sb()

* tag 'erofs-for-6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: drop unnecessary WARN_ON() in erofs_kill_sb()
  erofs: fix wrong primary bvec selection on deduplicated extents
parents 5e0ba145 4da3c718

fs/erofs/super.c

+0 −2
Original line number Diff line number Diff line
@@ -889,8 +889,6 @@ static void erofs_kill_sb(struct super_block *sb) 
{

	struct erofs_sb_info *sbi;



	WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC);



	/* pseudo mount for anon inodes */

	if (sb->s_flags & SB_KERNMOUNT) {

		kill_anon_super(sb);

fs/erofs/zdata.c

+4 −3
Original line number Diff line number Diff line
@@ -1144,10 +1144,11 @@ static void z_erofs_do_decompressed_bvec(struct z_erofs_decompress_backend *be, 
					 struct z_erofs_bvec *bvec)

{

	struct z_erofs_bvec_item *item;



	if (!((bvec->offset + be->pcl->pageofs_out) & ~PAGE_MASK)) {

	unsigned int pgnr;



	if (!((bvec->offset + be->pcl->pageofs_out) & ~PAGE_MASK) &&

	    (bvec->end == PAGE_SIZE ||

	     bvec->offset + bvec->end == be->pcl->length)) {

		pgnr = (bvec->offset + be->pcl->pageofs_out) >> PAGE_SHIFT;

		DBG_BUGON(pgnr >= be->nr_pages);

		if (!be->decompressed_pages[pgnr]) {