From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 5 Feb 2017 06:26:48 +0000 (-0500)
Subject: ext4: return EROFS if device is r/o and journal replay is needed
X-Git-Tag: v3.12.72~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05751f20bcfcd4b3372c0204bd0d184b72ed0ad1;p=thirdparty%2Fkernel%2Fstable.git

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: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 01fc2b14db0e5..3f19909f5431f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3977,7 +3977,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 	 */
 	if (!test_opt(sb, NOLOAD) &&
 	    EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL)) {
-		if (ext4_load_journal(sb, es, journal_devnum))
+		err = ext4_load_journal(sb, es, journal_devnum);
+		if (err)
 			goto failed_mount3;
 	} else if (test_opt(sb, NOLOAD) && !(sb->s_flags & MS_RDONLY) &&
 	      EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER)) {