Commit d6dcec96 authored Feb 05, 2017 by Theodore Ts'o Committed by Greg Kroah-Hartman Mar 12, 2017

ext4: return EROFS if device is r/o and journal replay is needed



commit 4753d8a24d4588657bc0a4cd66d4e282dff15c8c upstream.

If the file system requires journal recovery, and the device is
read-ony, return EROFS to the mount system call.  This allows xfstests
generic/050 to pass.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 269bf7b8

fs/ext4/super.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3913,7 +3913,8 @@ static int ext4_fill_super(struct super_block sb, void data, int silent)
		* root first: it may be modified in the journal!
		*/
		if (!test_opt(sb, NOLOAD) && ext4_has_feature_journal(sb)) {
		if (ext4_load_journal(sb, es, journal_devnum))
		err = ext4_load_journal(sb, es, journal_devnum);
		if (err)
		goto failed_mount3a;
		} else if (test_opt(sb, NOLOAD) && !(sb->s_flags & MS_RDONLY) &&
		ext4_has_feature_journal_needs_recovery(sb)) {