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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 AFC5DC2BA83 for ; Fri, 14 Feb 2020 16:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D0912187F for ; Fri, 14 Feb 2020 16:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581698274; bh=tYoCnjOn+1fB1j3/MzKxUrFR5VfQ/6uTuzDwfXjlhIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m7OaQ14gx1TLOZszZ2qPhdBrvP7kmT3vppuBz5IPy/UIlFM5+IOQpyZ8WApOpD5ub lKHroQQOMsIVSgHd7aPlT9gCaXP9+aAkLhhRZdfncbkqfJJtCWdbCUAJN5+9PRbZl6 QtZN/MlqQ8jB10ppYst+JVXIoPQl6C1/Wvz9krPM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393683AbgBNQhx (ORCPT ); Fri, 14 Feb 2020 11:37:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:60326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405714AbgBNQXs (ORCPT ); Fri, 14 Feb 2020 11:23:48 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E239124783; Fri, 14 Feb 2020 16:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697427; bh=tYoCnjOn+1fB1j3/MzKxUrFR5VfQ/6uTuzDwfXjlhIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vk1nRWqBdRxfVekdUwGHYANCABxVtHpnQmojzQUQUcEZZSjEbVSk2OVdpZLv66Z23 6L58USYKZytljXbCzTALAKMPw5ymPC1ejV8LQVK1fAjx3UPVKfSdZeRVcYvEGBGzPX LiSIOGuUOMDNo/0e13xl/6ieL/lxLLjuwRWXGqLQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "zhangyi (F)" , Jan Kara , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 116/141] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record Date: Fri, 14 Feb 2020 11:20:56 -0500 Message-Id: <20200214162122.19794-116-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214162122.19794-1-sashal@kernel.org> References: <20200214162122.19794-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 d002b2b6895fe..5531f3d7d82b2 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -779,7 +779,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) 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 @@ void jbd2_journal_commit_transaction(journal_t *journal) 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