Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1363831

[PATCH 2/4] f2fs: give RO message when recovering superblock

Show all headers | View raw

When one of superblocks is missing, f2fs recovers it with the valid one.
But, even if f2fs is mounted as RO, we'd better notify that too.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/super.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 5afb4a6..742fc48 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1298,6 +1298,9 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
 	struct buffer_head *bh;
 	int err;
 
+	if (f2fs_readonly(sbi->sb) || bdev_read_only(sbi->sb->s_bdev))
+		return -EROFS;
+
 	/* write back-up superblock first */
 	bh = sb_getblk(sbi->sb, sbi->valid_super_block ? 0: 1);
 	if (!bh)
@@ -1565,7 +1568,7 @@ try_onemore:
 	kfree(options);
 
 	/* recover broken superblock */
-	if (recovery && !f2fs_readonly(sb) && !bdev_read_only(sb->s_bdev)) {
+	if (recovery) {
 		err = f2fs_commit_super(sbi, true);
 		f2fs_msg(sb, KERN_INFO,
 			"Try to recover %dth superblock, ret: %ld",
-- 
2.6.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] f2fs: cover large section in sanity check of super Jaegeuk Kim <jaegeuk@kernel.org> - 2016-03-24 02:40 +0100
  [PATCH 2/4] f2fs: give RO message when recovering superblock Jaegeuk Kim <jaegeuk@kernel.org> - 2016-03-24 02:40 +0100
  [PATCH 4/4] f2fs: give -EINVAL for norecovery and rw mount Jaegeuk Kim <jaegeuk@kernel.org> - 2016-03-24 02:40 +0100
  [PATCH 3/4] f2fs: recover superblock at RW remounts Jaegeuk Kim <jaegeuk@kernel.org> - 2016-03-24 02:40 +0100

csiph-web