Skip to content

Commit a8eb3de

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix return value of f2fs_convert_inline_inode()
If device is readonly, make f2fs_convert_inline_inode() return EROFS instead of zero, otherwise it may trigger panic during writeback of inline inode's dirty page as below: f2fs_write_single_data_page+0xbb6/0x1e90 fs/f2fs/data.c:2888 f2fs_write_cache_pages fs/f2fs/data.c:3187 [inline] __f2fs_write_data_pages fs/f2fs/data.c:3342 [inline] f2fs_write_data_pages+0x1efe/0x3a90 fs/f2fs/data.c:3369 do_writepages+0x359/0x870 mm/page-writeback.c:2634 filemap_fdatawrite_wbc+0x125/0x180 mm/filemap.c:397 __filemap_fdatawrite_range mm/filemap.c:430 [inline] file_write_and_wait_range+0x1aa/0x290 mm/filemap.c:788 f2fs_do_sync_file+0x68a/0x1ae0 fs/f2fs/file.c:276 generic_write_sync include/linux/fs.h:2806 [inline] f2fs_file_write_iter+0x7bd/0x24e0 fs/f2fs/file.c:4977 call_write_iter include/linux/fs.h:2114 [inline] new_sync_write fs/read_write.c:497 [inline] vfs_write+0xa72/0xc90 fs/read_write.c:590 ksys_write+0x1a0/0x2c0 fs/read_write.c:643 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f Cc: [email protected] Reported-by: [email protected] Closes: https://lore.kernel.org/linux-f2fs-devel/[email protected] Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 270b093 commit a8eb3de

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/f2fs/inline.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,10 @@ int f2fs_convert_inline_inode(struct inode *inode)
221221
struct page *ipage, *page;
222222
int err = 0;
223223

224-
if (!f2fs_has_inline_data(inode) ||
225-
f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
224+
if (f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
225+
return -EROFS;
226+
227+
if (!f2fs_has_inline_data(inode))
226228
return 0;
227229

228230
err = f2fs_dquot_initialize(inode);

0 commit comments

Comments
 (0)