Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753111AbdCKF1T (ORCPT ); Sat, 11 Mar 2017 00:27:19 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50848 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750939AbdCKF1L (ORCPT ); Sat, 11 Mar 2017 00:27:11 -0500 Message-ID: <1489210023.2838.0.camel@decadent.org.uk> Subject: Re: [PATCH 4.4 49/91] ext4: preserve the needs_recovery flag when the journal is aborted From: Ben Hutchings To: "Theodore Ts'o" Cc: stable@vger.kernel.org, Greg Kroah-Hartman , linux-kernel@vger.kernel.org Date: Sat, 11 Mar 2017 05:27:03 +0000 In-Reply-To: <20170310201406.n4w3vhmrcr4xmcyt@thunk.org> References: <20170310083900.730556986@linuxfoundation.org> <20170310083903.222968810@linuxfoundation.org> <1489165082.2593.19.camel@decadent.org.uk> <20170310201406.n4w3vhmrcr4xmcyt@thunk.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-gbcrCY4sVMhHRqB7ig/N" X-Mailer: Evolution 3.22.5-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2343 Lines: 66 --=-gbcrCY4sVMhHRqB7ig/N Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2017-03-10 at 15:14 -0500, Theodore Ts'o wrote: > On Fri, Mar 10, 2017 at 04:58:02PM +0000, Ben Hutchings wrote: > > > --- > > > =C2=A0fs/ext4/super.c |=C2=A0=C2=A0=C2=A0=C2=A06 ++++-- > > > =C2=A01 file changed, 4 insertions(+), 2 deletions(-) > > >=20 > > > --- a/fs/ext4/super.c > > > +++ b/fs/ext4/super.c > >=20 > > [...] > > > @@ -802,9 +803,10 @@ static void ext4_put_super(struct super_ > > > =C2=A0 destroy_workqueue(sbi->rsv_conversion_wq); > > > =C2=A0 > > > =C2=A0 if (sbi->s_journal) { > > > + aborted =3D is_journal_aborted(sbi->s_journal); > > > =C2=A0 err =3D jbd2_journal_destroy(sbi->s_journal); > > > =C2=A0 sbi->s_journal =3D NULL; > > > - if (err < 0) > > > + if ((err < 0) && !aborted) > > > =C2=A0 ext4_abort(sb, "Couldn't clean up the journal"); > >=20 > > [...] > >=20 > > Shouldn't the aborted flag also be set here when err < 0? >=20 > Nice catch.=C2=A0=C2=A0That's a separate issue (the bug was there before = this > commit), though I'll send a separate patch to fix this in mainline and > then cc stable, OK? Sure, that's not an objection to including this patch in stable now. Ben. --=20 Ben Hutchings If you seem to know what you are doing, you'll be given more to do. --=-gbcrCY4sVMhHRqB7ig/N Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAljDiqcACgkQ57/I7JWG EQkLIRAAo13piPtTzbyKPalDME8+3Dib7U3UFG7qE1xcB0LDTO+yVg49LAV+PVCs UIQXmyZRPLNnJxBZah9mVTzWelzkCkpu9rgfvU6hvspCVMEHk4xD62YY0V/AdxcT RQEAiXH2WSrQm75Ge26vIe/mi5/NImt7DTbIQjXfOUcWoFwBhYW6vK+I/b6CjpC8 ddF8f2emXLPw3cVReMNxVe9IckTIqtAXWjoe8fK54LWi0/6MPp8tPNFjCGEvK+6f xQUZXq8omYDdlM1/VYK3GzB+52FQ2IeiZ4x2o2HwzpuZoM/CAqe59u/KAtdrbpmw zXUhuCEea1Ce0x2ozk3MQZW9bVtB5OhpCNl0ttCJVb4n3tg0/sPzdL77YnhlB3Bf B/HX7DNBbr9h0KEN5Ft+E/JEthMx1tI4qwes7XOke9MkQDZp7Dc4X0ZiCVRfu+y1 uw2arLVq06ZDtLZL7PgWbteEff89vjhCUrn/Ct0Bu95iComaYoYUfU0F0dVPnzje cnz0gzgbGfWCmXrDza4/opgumcalf9r8iL2jAiQtZ+0D3dLvU7kLD05os8qizJSF 3U002V9VkoTt82ebAj8NSZmhv77Gxvt1DgAUkIdyya4K29fBF3wZY4B1m4b6e1Vx cXL1+CffRKXCoVkoHG83zkeXnmdmjX7z29TE8tFSrWFpIogteMA= =428G -----END PGP SIGNATURE----- --=-gbcrCY4sVMhHRqB7ig/N--