Commit 9cca4987 authored by Eric Sandeen's avatar Eric Sandeen Committed by Jaegeuk Kim
Browse files

f2fs: defer readonly check vs norecovery 



Defer the readonly-vs-norecovery check until after option parsing is done
so that option parsing does not require an active superblock for the test.
Add a helpful message, while we're at it.

(I think could be moved back into parsing after we switch to the new mount
API if desired, as the fs context will have RO state available.)

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0edcb219

fs/f2fs/super.c

+7 −3
Original line number Diff line number Diff line
@@ -730,10 +730,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
			set_opt(sbi, DISABLE_ROLL_FORWARD);

			break;

		case Opt_norecovery:

			/* this option mounts f2fs with ro */

			/* requires ro mount, checked in f2fs_default_check */

			set_opt(sbi, NORECOVERY);

			if (!f2fs_readonly(sb))

				return -EINVAL;

			break;

		case Opt_discard:

			if (!f2fs_hw_support_discard(sbi)) {
@@ -1417,6 +1415,12 @@ static int f2fs_default_check(struct f2fs_sb_info *sbi) 
		f2fs_err(sbi, "Allow to mount readonly mode only");

		return -EROFS;

	}



	if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) {

		f2fs_err(sbi, "norecovery requires readonly mount");

		return -EINVAL;

	}



	return 0;

}