From mboxrd@z Thu Jan 1 00:00:00 1970 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,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 BD3BCC3F36A for ; Thu, 27 Feb 2020 13:49:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88B9220578 for ; Thu, 27 Feb 2020 13:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811346; bh=MvR9W5cURBNIlhPtsdRr7m1uiN0eF6tW07+/SkPqVPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j5hN/LY8t8ozl70e5JS7bCtyybr/n1CGgUGK9Fcg699VNvRxo0it25U0XR5SBQABQ uaWpYvpaKhd6cdD4A5DqqEIRzNpx8mVypa7ZG6OGBg//pbogFOF9X8le08THRfLzWX WyjwLZ/6OGZvatwzqlSj8hP15KNULSBt0vSgvJTo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730990AbgB0NtF (ORCPT ); Thu, 27 Feb 2020 08:49:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:46138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730495AbgB0NtC (ORCPT ); Thu, 27 Feb 2020 08:49:02 -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 56ECE20578; Thu, 27 Feb 2020 13:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811341; bh=MvR9W5cURBNIlhPtsdRr7m1uiN0eF6tW07+/SkPqVPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=luRMKEUks8N+a8zMPqfMqR328HX4pYFoCggFWh2Prysh4sTwTDH82NL43ptJI2GTF Rm0OtVUXqpx6GyH3F0Ca2a81m23NjcB5pNGzq2nCw8dxyCaTafgrNlEZ8g7idTc/0w uQGNSfGxfz9TanCbxGiQWr2h7JlTYHo7NMoPW5z0= 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 4.9 096/165] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record Date: Thu, 27 Feb 2020 14:36:10 +0100 Message-Id: <20200227132245.304004223@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132230.840899170@linuxfoundation.org> References: <20200227132230.840899170@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 72b5bbfd38447..1d06f81ee8b47 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -779,7 +779,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); @@ -872,7 +872,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); -- 2.20.1