Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <AEF7E6AA-9663-4470-A689-FD55062EC8CA@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_98B24CEE-383F-42F0-B1F3-F7FD945F01F1";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 01/12] ext4: Don't remount read-only with errors=continue
 on reboot
Date:   Sun, 29 Nov 2020 14:33:35 -0700
In-Reply-To: <20201127113405.26867-2-jack@suse.cz>
Cc:     Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org
To:     Jan Kara <jack@suse.cz>
References: <20201127113405.26867-1-jack@suse.cz>
 <20201127113405.26867-2-jack@suse.cz>
Precedence: bulk


--Apple-Mail=_98B24CEE-383F-42F0-B1F3-F7FD945F01F1
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

On Nov 27, 2020, at 4:33 AM, Jan Kara <jack@suse.cz> wrote:
> 
> ext4_handle_error() with errors=continue mount option can accidentally
> remount the filesystem read-only when the system is rebooting. Fix that.
> 
> Fixes: 1dc1097ff60e ("ext4: avoid panic during forced reboot")
> Signed-off-by: Jan Kara <jack@suse.cz>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> fs/ext4/super.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 94472044f4c1..2b08b162075c 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -666,19 +666,17 @@ static bool system_going_down(void)
> 
> static void ext4_handle_error(struct super_block *sb)
> {
> +	journal_t *journal = EXT4_SB(sb)->s_journal;
> +
> 	if (test_opt(sb, WARN_ON_ERROR))
> 		WARN_ON_ONCE(1);
> 
> -	if (sb_rdonly(sb))
> +	if (sb_rdonly(sb) || test_opt(sb, ERRORS_CONT))
> 		return;
> 
> -	if (!test_opt(sb, ERRORS_CONT)) {
> -		journal_t *journal = EXT4_SB(sb)->s_journal;
> -
> -		ext4_set_mount_flag(sb, EXT4_MF_FS_ABORTED);
> -		if (journal)
> -			jbd2_journal_abort(journal, -EIO);
> -	}
> +	ext4_set_mount_flag(sb, EXT4_MF_FS_ABORTED);
> +	if (journal)
> +		jbd2_journal_abort(journal, -EIO);
> 	/*
> 	 * We force ERRORS_RO behavior when system is rebooting. Otherwise we
> 	 * could panic during 'reboot -f' as the underlying device got already
> --
> 2.16.4
> 


Cheers, Andreas


--Apple-Mail=_98B24CEE-383F-42F0-B1F3-F7FD945F01F1
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAl/EE68ACgkQcqXauRfM
H+Dx4w//WPpL0S1/ArRhK21o+CVIFZiZkQD8vt+VLQENYPiXaZHby3RCl5YgzemH
n6C2pJ5l4cZ/ZP7pBB73rH96RusG9z3ktSL+ftcCDlSwtlTqitvtgb72dASiDqf0
gNArH581TVDAZqHVLjljF7yd+VgQXYI5xl/I+a+WjGUjjmd2pbB7F2Yir5jvwHry
JYVYHjPtnWRdZ7elghf36q1Y2gzUBY3f8ZbiQa1csJuSiuemJZzhqStgc1ITU/KM
yUfNZ7TrNvU7IarmZPW4o1pVnkl6CuC+gFuZRuW6Jsmsdjwwt+We8PyhRHvtAIAZ
tineav6DI/KHEpxoEhlYrZugH2tMASN48ktMkYJE80qFsPdSyWwENdvXttrS5Das
9V/qFmCCP5cCEDDsI07HYhEIzUPwxNs2jOf/9GvNFaUT23KveWQqETFA09Mq9/vZ
mQussBpwZy0AUtdZeYGx3um761iKiiXWYmKtCfYt6M3UKRZUGfA5X9jHDqqLpOB6
CJAHkDOHnUwyK8D60a7dPHyNVomOHkKl5QE53DEUKUe4iVbNpLvr4WdED9+i8dac
4hs6sNXOET7xanUj9k2dKp85Ks1Rn7EWTSkDCz1+6hd8w2wmZyzPi23t8MT1tRnD
ScPht47ksDiPTOePg24vPeLxGd7bVu62pQB/gjPTg9W7DJG5hsA=
=0Btj
-----END PGP SIGNATURE-----

--Apple-Mail=_98B24CEE-383F-42F0-B1F3-F7FD945F01F1--