Skip to contentSkip to conversation

f2fs: fix to check readonly condition correctly

PATCH Superseded Chao Yu 2 participants 6 messages Apr 2, 2023 – Apr 11, 2023 F2FS file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chao Yu

author maintainer
#0 lore raw

PATCH 1/1 f2fs: fix to check readonly condition correctly

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

---
 fs/f2fs/checkpoint.c |  2 +-
 fs/f2fs/f2fs.h       | 10 +++++-----
 fs/f2fs/inline.c     |  3 +--
 fs/f2fs/super.c      | 13 +++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 	unsigned long long ckpt_ver;
 	int err = 0;
 
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
 		return -EROFS;
 
 	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
 	return false;
 }
 
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
 static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
 {
 	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
 	}
 }
 
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
 #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
 #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
 	struct page *ipage, *page;
 	int err = 0;
 
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
 		return 0;
 
 	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +7 -6
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		return -EINVAL;
 	}
 
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
 		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
 		return -EINVAL;
 	}
 
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
 	return 0;
 }
 
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
 	set_opt(sbi, MERGE_CHECKPOINT);
 	F2FS_OPTION(sbi).unusable_cap = 0;
 	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
 		set_opt(sbi, FLUSH_MERGE);
 	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
 		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1
maintainer
#1 lore raw
Quoted 10 lines · Chao Yu

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

What is the problem to solve here?

Quoted 101 lines
---
 fs/f2fs/checkpoint.c |  2 +-
 fs/f2fs/f2fs.h       | 10 +++++-----
 fs/f2fs/inline.c     |  3 +--
 fs/f2fs/super.c      | 13 +++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 	unsigned long long ckpt_ver;
 	int err = 0;
 
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
 		return -EROFS;
 
 	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
 	return false;
 }
 
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
 static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
 {
 	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
 	}
 }
 
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
 #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
 #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
 	struct page *ipage, *page;
 	int err = 0;
 
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
 		return 0;
 
 	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +7 -6
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		return -EINVAL;
 	}
 
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
 		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
 		return -EINVAL;
 	}
 
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
 	return 0;
 }
 
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
 	set_opt(sbi, MERGE_CHECKPOINT);
 	F2FS_OPTION(sbi).unusable_cap = 0;
 	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
 		set_opt(sbi, FLUSH_MERGE);
 	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
 		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

author maintainer
#2 lore raw
Quoted 12 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

Quoted 1 line

What is the problem to solve here?

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 I introduced f2fs_dev_is_readonly(), and check multi-devices rw status in parse_options() 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

Thanks,

Quoted 102 lines
Quoted 102 lines
---
  fs/f2fs/checkpoint.c |  2 +-
  fs/f2fs/f2fs.h       | 10 +++++-----
  fs/f2fs/inline.c     |  3 +--
  fs/f2fs/super.c      | 13 +++++++------
  4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
  	unsigned long long ckpt_ver;
  	int err = 0;
 
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
  		return -EROFS;
 
  	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
  	return false;
  }
 
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
  static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
  {
  	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
  	}
  }
 
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
  #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
  #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
  	struct page *ipage, *page;
  	int err = 0;
 
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
  		return 0;
 
  	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +7 -6
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
  		return -EINVAL;
  	}
 
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
  		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
  		return -EINVAL;
  	}
 
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
  	return 0;
  }
 
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
  	set_opt(sbi, MERGE_CHECKPOINT);
  	F2FS_OPTION(sbi).unusable_cap = 0;
  	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
  		set_opt(sbi, FLUSH_MERGE);
  	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
  		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1
author maintainer
#3 lore raw
In reply to Jaegeuk Kim
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

Jaegeuk,

Please drop this patch, and help to check below one, thanks. :)

f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()

Thanks,

Quoted 104 lines

What is the problem to solve here?

Quoted 101 lines
---
  fs/f2fs/checkpoint.c |  2 +-
  fs/f2fs/f2fs.h       | 10 +++++-----
  fs/f2fs/inline.c     |  3 +--
  fs/f2fs/super.c      | 13 +++++++------
  4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
  	unsigned long long ckpt_ver;
  	int err = 0;
 
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
  		return -EROFS;
 
  	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
  	return false;
  }
 
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
  static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
  {
  	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
  	}
  }
 
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
  #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
  #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
  	struct page *ipage, *page;
  	int err = 0;
 
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
  		return 0;
 
  	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +7 -6
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
  		return -EINVAL;
  	}
 
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
  		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
  		return -EINVAL;
  	}
 
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
  	return 0;
  }
 
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
  	set_opt(sbi, MERGE_CHECKPOINT);
  	F2FS_OPTION(sbi).unusable_cap = 0;
  	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
  		set_opt(sbi, FLUSH_MERGE);
  	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
  		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1
author maintainer
#4 lore raw
Quoted 13 lines · Chao Yu
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

Quoted 5 lines

Jaegeuk,

Please drop this patch, and help to check below one, thanks. :)

f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()

Oh, I didn't make it clear.

I found you applied both v1 and v2 of this patch.

So I mean how about keeping v2:

[PATCH v2] f2fs: fix to check readonly condition correctly
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=2bce08d26c0fe3a4ce1cca03ee0ea0c59d98c0b2

and apply

[PATCH] f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=7ec21ff2e8f521842938415af741fc72f39c0135

to instead

[PATCH] f2fs: fix to check readonly condition correctly
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=66eb18a8b892afe085097747521fb280a1577ea4

Thanks,

Quoted 113 lines

Thanks,

Quoted 93 lines

What is the problem to solve here?

Quoted 90 lines
---
   fs/f2fs/checkpoint.c |  2 +-
   fs/f2fs/f2fs.h       | 10 +++++-----
   fs/f2fs/inline.c     |  3 +--
   fs/f2fs/super.c      | 13 +++++++------
   4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
   	unsigned long long ckpt_ver;
   	int err = 0;
 
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
   		return -EROFS;
 
   	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
   	return false;
   }
 
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
   static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
   {
   	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
   	}
   }
 
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
   #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
   #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
   	struct page *ipage, *page;
   	int err = 0;
 
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
   		return 0;
 
   	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +6 -5
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
   		return -EINVAL;
   	}
 
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
   		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
   		return -EINVAL;
   	}
 
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
   	return 0;
   }
 
Quoted 11 lines
Quoted 11 lines
fs/f2fs/super.c +1 -1
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
   	set_opt(sbi, MERGE_CHECKPOINT);
   	F2FS_OPTION(sbi).unusable_cap = 0;
   	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
   		set_opt(sbi, FLUSH_MERGE);
   	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
   		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#5 lore raw
Quoted 16 lines · Chao Yu
Quoted 15 lines · Chao Yu
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu

This patch does below changes:

- If f2fs enables readonly feature or device is readonly, allow to mount readonly mode only
- Introduce f2fs_dev_is_readonly() to indicate whether image or device is readonly
- remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() and f2fs_convert_inline_inode()
- enable FLUSH_MERGE only if f2fs is mounted as rw and image/device is writable

Jaegeuk,

Quoted 7 lines
Quoted 3 lines

Please drop this patch, and help to check below one, thanks. :)

f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()

Oh, I didn't make it clear.

I found you applied both v1 and v2 of this patch.

Yeah, I was keeping the fixes locally. Please check again.

Quoted 11 lines

So I mean how about keeping v2:

[PATCH v2] f2fs: fix to check readonly condition correctly
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=2bce08d26c0fe3a4ce1cca03ee0ea0c59d98c0b2

and apply

[PATCH] f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=7ec21ff2e8f521842938415af741fc72f39c0135

Quoted 110 lines

to instead

[PATCH] f2fs: fix to check readonly condition correctly
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=66eb18a8b892afe085097747521fb280a1577ea4

Thanks,

Quoted 103 lines

Thanks,

Quoted 86 lines

What is the problem to solve here?

Quoted 83 lines
---
   fs/f2fs/checkpoint.c |  2 +-
   fs/f2fs/f2fs.h       | 10 +++++-----
   fs/f2fs/inline.c     |  3 +--
   fs/f2fs/super.c      | 13 +++++++------
   4 files changed, 14 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +1 -1
index 8e1db5752fff..1eef597ed393 100644
@@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
   	unsigned long long ckpt_ver;
   	int err = 0;
-	if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi))
+	if (f2fs_readonly(sbi->sb))
   		return -EROFS;
   	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
fs/f2fs/f2fs.h +5 -5
index 2d4a7ef62537..7de95133478a 100644
@@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi)
   	return false;
   }
+static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi);
+}
+
   static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)
   {
   	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;
@@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
   	}
   }
-static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
-{
-	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
-}
-
   #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
   #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
fs/f2fs/inline.c +1 -2
index 72269e7efd26..2c36f2dc2317 100644
@@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
   	struct page *ipage, *page;
   	int err = 0;
-	if (!f2fs_has_inline_data(inode) ||
-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb))
+	if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb))
   		return 0;
   	err = f2fs_dquot_initialize(inode);
fs/f2fs/super.c +6 -5
index d016f398fcad..db7649010c12 100644
@@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
   		return -EINVAL;
   	}
-	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
+		f2fs_err(sbi, "Allow to mount readonly mode only");
+		return -EROFS;
+	}
+
+	if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) {
   		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
   		return -EINVAL;
   	}
-	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
-		f2fs_err(sbi, "Allow to mount readonly mode only");
-		return -EROFS;
-	}
   	return 0;
   }
@@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi)
   	set_opt(sbi, MERGE_CHECKPOINT);
   	F2FS_OPTION(sbi).unusable_cap = 0;
Quoted 8 lines
Quoted 8 lines
fs/f2fs/super.c +1 -1
   	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_is_readonly(sbi))
+	if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi))
   		set_opt(sbi, FLUSH_MERGE);
   	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
   		set_opt(sbi, DISCARD);
Signature · 1 line
2.36.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel