Commit 98ac9cc4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'f2fs-fix-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs fixes from Jaegeuk Kim:

 - fix soft lockupg caused by iput() added in bc986b1d ("fs: stop
   accessing ->i_count directly in f2fs and gfs2")

 - fix a wrong block address map on multiple devices

Link: https://lore.kernel.org/oe-lkp/202509301450.138b448f-lkp@intel.com [1]

* tag 'f2fs-fix-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: fix wrong block mapping for multi-devices
  f2fs: don't call iput() from f2fs_drop_inode()
parents 9f388a65 9d5c4f5c

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -1497,8 +1497,8 @@ static bool f2fs_map_blocks_cached(struct inode *inode, 
		struct f2fs_dev_info *dev = &sbi->devs[bidx];



		map->m_bdev = dev->bdev;

		map->m_pblk -= dev->start_blk;

		map->m_len = min(map->m_len, dev->end_blk + 1 - map->m_pblk);

		map->m_pblk -= dev->start_blk;

	} else {

		map->m_bdev = inode->i_sb->s_bdev;

	}

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1820,7 +1820,7 @@ static int f2fs_drop_inode(struct inode *inode) 
			sb_end_intwrite(inode->i_sb);



			spin_lock(&inode->i_lock);

			iput(inode);

			atomic_dec(&inode->i_count);

		}

		trace_f2fs_drop_inode(inode, 0);

		return 0;