diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-16 10:58:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-16 10:58:49 -0700 |
| commit | 98ac9cc4b4452ed7e714eddc8c90ac4ae5da1a09 (patch) | |
| tree | 06d345e729488cf7b3c74fb9649d6ea0f948b1de | |
| parent | 9f388a653c8a481cbdbdedca081a1f9f3ba204a2 (diff) | |
| parent | 9d5c4f5c7a2c7677e1b3942772122b032c265aae (diff) | |
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 bc986b1d756482a ("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()
| -rw-r--r-- | fs/f2fs/data.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/super.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index ef38e62cda8f..775aa4f63aa3 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -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; } diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index fd8e7b0b2166..db7afb806411 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -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; |