Skip to content

Commit 98ac9cc

Browse files
committed
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 bc986b1 ("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()
2 parents 9f388a6 + 9d5c4f5 commit 98ac9cc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/f2fs/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1497,8 +1497,8 @@ static bool f2fs_map_blocks_cached(struct inode *inode,
14971497
struct f2fs_dev_info *dev = &sbi->devs[bidx];
14981498

14991499
map->m_bdev = dev->bdev;
1500-
map->m_pblk -= dev->start_blk;
15011500
map->m_len = min(map->m_len, dev->end_blk + 1 - map->m_pblk);
1501+
map->m_pblk -= dev->start_blk;
15021502
} else {
15031503
map->m_bdev = inode->i_sb->s_bdev;
15041504
}

fs/f2fs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@ static int f2fs_drop_inode(struct inode *inode)
18201820
sb_end_intwrite(inode->i_sb);
18211821

18221822
spin_lock(&inode->i_lock);
1823-
iput(inode);
1823+
atomic_dec(&inode->i_count);
18241824
}
18251825
trace_f2fs_drop_inode(inode, 0);
18261826
return 0;

0 commit comments

Comments
 (0)