Skip to content

Commit b8bc592

Browse files
chaseyusmb49
authored andcommitted
f2fs: fix to check readonly condition correctly
BugLink: https://bugs.launchpad.net/bugs/2028808 [ Upstream commit d78dfef ] With below case, it can mount multi-device image w/ rw option, however one of secondary device is set as ro, later update will cause panic, so let's introduce f2fs_dev_is_readonly(), and check multi-devices rw status in f2fs_remount() w/ it in order to avoid such inconsistent mount status. mkfs.f2fs -c /dev/zram1 /dev/zram0 -f blockdev --setro /dev/zram1 mount -t f2fs dev/zram0 /mnt/f2fs mount: /mnt/f2fs: WARNING: source write-protected, mounted read-only. mount -t f2fs -o remount,rw mnt/f2fs dd if=/dev/zero of=/mnt/f2fs/file bs=1M count=8192 kernel BUG at fs/f2fs/inline.c:258! RIP: 0010:f2fs_write_inline_data+0x23e/0x2d0 [f2fs] Call Trace: f2fs_write_single_data_page+0x26b/0x9f0 [f2fs] f2fs_write_cache_pages+0x389/0xa60 [f2fs] __f2fs_write_data_pages+0x26b/0x2d0 [f2fs] f2fs_write_data_pages+0x2e/0x40 [f2fs] do_writepages+0xd3/0x1b0 __writeback_single_inode+0x5b/0x420 writeback_sb_inodes+0x236/0x5a0 __writeback_inodes_wb+0x56/0xf0 wb_writeback+0x2a3/0x490 wb_do_writeback+0x2b2/0x330 wb_workfn+0x6a/0x260 process_one_work+0x270/0x5e0 worker_thread+0x52/0x3e0 kthread+0xf4/0x120 ret_from_fork+0x29/0x50 Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 9ef323c commit b8bc592

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

fs/f2fs/f2fs.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4476,6 +4476,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
44764476
return false;
44774477
}
44784478

4479+
static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
4480+
{
4481+
return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
4482+
}
4483+
44794484
static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
44804485
{
44814486
return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;

fs/f2fs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
22822282
if (f2fs_readonly(sb) && (*flags & SB_RDONLY))
22832283
goto skip;
22842284

2285-
if (f2fs_sb_has_readonly(sbi) && !(*flags & SB_RDONLY)) {
2285+
if (f2fs_dev_is_readonly(sbi) && !(*flags & SB_RDONLY)) {
22862286
err = -EROFS;
22872287
goto restore_opts;
22882288
}

0 commit comments

Comments
 (0)