Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c3c373e authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to consider multiple device for readonly check 



This patch introduce f2fs_hw_is_readonly() to check whether lower
device is readonly or not, it adapts multiple device scenario.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 49a00e7b

fs/f2fs/f2fs.h

+14 −0
Original line number Diff line number Diff line
@@ -3609,6 +3609,20 @@ static inline bool f2fs_realtime_discard_enable(struct f2fs_sb_info *sbi) 
					f2fs_hw_should_discard(sbi);

}



static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)

{

	int i;



	if (!f2fs_is_multi_device(sbi))

		return bdev_read_only(sbi->sb->s_bdev);



	for (i = 0; i < sbi->s_ndevs; i++)

		if (bdev_read_only(FDEV(i).bdev))

			return true;

	return false;

}





static inline void set_opt_mode(struct f2fs_sb_info *sbi, unsigned int mt)

{

	clear_opt(sbi, ADAPTIVE);

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3377,7 +3377,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		 * mount should be failed, when device has readonly mode, and

		 * previous checkpoint was not done by clean system shutdown.

		 */

		if (bdev_read_only(sb->s_bdev) &&

		if (f2fs_hw_is_readonly(sbi) &&

				!is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {

			err = -EROFS;

			goto free_meta;