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=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 74647C3B1A1 for ; Fri, 14 Feb 2020 17:21:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45FB420637 for ; Fri, 14 Feb 2020 17:21:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581700893; bh=QTJ9Kg3VYZ3zWPWj0Uv6WNsojZ4uA4pahx8vI4MGYX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g+l+rWaR4h+BjTXJwYcajsOU7t5ODAW16MQ/7nhfnBwXhs6BXVjR5LZ+g3R6ybjID OY4kb7Di1EEzoggMietxFMOEcUOutK/0Sr/XweOdxilAqNQfSIcZbrp7mb16fla6Wp dze4KNnq1N3Wf7VkQvNHZpgGPpd+z1xQ8leASbdw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391453AbgBNQKS (ORCPT ); Fri, 14 Feb 2020 11:10:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:35768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391451AbgBNQKS (ORCPT ); Fri, 14 Feb 2020 11:10:18 -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 BB22624697; Fri, 14 Feb 2020 16:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696617; bh=QTJ9Kg3VYZ3zWPWj0Uv6WNsojZ4uA4pahx8vI4MGYX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E8W5f88TXTbhfm8CU8O97cqGShRCamjv8OiB784co4s3TznPnY8Nu+qEEkIIRpdso iwWpRmjJ8YT8rKcA3rAfWHQhjLCLE3q3Up4epGkuCFtrzAkebQvKREHG10bJnA56wA nhWqAHBAKygF4OWXSgOJOalsjd8qzopwfCrxgJiU= 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 5.4 399/459] jbd2: make sure ESHUTDOWN to be recorded in the journal superblock Date: Fri, 14 Feb 2020 11:00:49 -0500 Message-Id: <20200214160149.11681-399-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "zhangyi (F)" [ Upstream commit 0e98c084a21177ef136149c6a293b3d1eb33ff92 ] Commit fb7c02445c49 ("ext4: pass -ESHUTDOWN code to jbd2 layer") want to allow jbd2 layer to distinguish shutdown journal abort from other error cases. So the ESHUTDOWN should be taken precedence over any other errno which has already been recoded after EXT4_FLAGS_SHUTDOWN is set, but it only update errno in the journal suoerblock now if the old errno is 0. Fixes: fb7c02445c49 ("ext4: pass -ESHUTDOWN code to jbd2 layer") Signed-off-by: zhangyi (F) Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20191204124614.45424-4-yi.zhang@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/jbd2/journal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 65e78d3a2f64c..c1ce2805c5639 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2114,8 +2114,7 @@ static void __journal_abort_soft (journal_t *journal, int errno) if (journal->j_flags & JBD2_ABORT) { write_unlock(&journal->j_state_lock); - if (!old_errno && old_errno != -ESHUTDOWN && - errno == -ESHUTDOWN) + if (old_errno != -ESHUTDOWN && errno == -ESHUTDOWN) jbd2_journal_update_sb_errno(journal); return; } -- 2.20.1