From patchwork Fri Feb 21 07:41:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69B88C35640 for ; Fri, 21 Feb 2020 08:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35A68206ED for ; Fri, 21 Feb 2020 08:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582274452; bh=cEQMdcc8WTOTem/Ek9qVt8CLr46UoNPH3C+4E/CD0ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2U1NzVhWPnpr2t5fsuhpHJk4L1/xdW/op4YUs0AvG+ChE2PfjVfnIO/bcmVE1YM32 B+E3mS2cF36mgQ/0BkwVDQRIng7Cz9NloWjTg064TbNin0IR6f6GPRUj2DWI/6AC/U uzVSSUi1URv9DkZOMJXes2t4Ok3BzhfWq2tVvlOg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730459AbgBUH6V (ORCPT ); Fri, 21 Feb 2020 02:58:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:58080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730749AbgBUH6R (ORCPT ); Fri, 21 Feb 2020 02:58:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E71AB20801; Fri, 21 Feb 2020 07:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271897; bh=cEQMdcc8WTOTem/Ek9qVt8CLr46UoNPH3C+4E/CD0ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ok/g9YTN6JARWN9h8nUKLgPk+ut3VGO9UakRf6rHLIJxxE4zDHzDURFgFT4eGFyWQ HSYX4+XPYEslRghHFZWJOAI6vbD1+BaOrh+Uyz+Y1hWjd27EYinOhumm2TuPnN489p 20mTv/xqUFtrcab0NWrh0q+1SBSGHxFQePxX/ReE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "zhangyi (F)" , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 5.5 339/399] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record Date: Fri, 21 Feb 2020 08:41:04 +0100 Message-Id: <20200221072433.869843546@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: zhangyi (F) [ Upstream commit d0a186e0d3e7ac05cc77da7c157dae5aa59f95d9 ] We invoke jbd2_journal_abort() to abort the journal and record errno in the jbd2 superblock when committing journal transaction besides the failure on submitting the commit record. But there is no need for the case and we can also invoke jbd2_journal_abort() instead of __jbd2_journal_abort_hard(). Fixes: 818d276ceb83a ("ext4: Add the journal checksum feature") Signed-off-by: zhangyi (F) Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20191204124614.45424-2-yi.zhang@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/jbd2/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 3845750f70ec8..27373f5792a4f 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -782,7 +782,7 @@ start_journal_io: err = journal_submit_commit_record(journal, commit_transaction, &cbh, crc32_sum); if (err) - __jbd2_journal_abort_hard(journal); + jbd2_journal_abort(journal, err); } blk_finish_plug(&plug); @@ -875,7 +875,7 @@ start_journal_io: err = journal_submit_commit_record(journal, commit_transaction, &cbh, crc32_sum); if (err) - __jbd2_journal_abort_hard(journal); + jbd2_journal_abort(journal, err); } if (cbh) err = journal_wait_on_commit_record(journal, cbh);