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 7A4E8C2BA83 for ; Fri, 14 Feb 2020 17:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52B1E20848 for ; Fri, 14 Feb 2020 17:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581702703; bh=QfuO7T46To2INqXAS+MsM/KdnZqxbxpxWwbFcGzURAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nJv45XJGgDhcBhVcHZ4DQpGdolWz7diGOdu6hWdY1Pv2v6mjqpUB13FiG6pt4A1Mn AyubyohQO4C7wbQoGmnG/yZmc8u5E1jWRmTW9lfwy52+doDM/rI09soVar0xOhu22r ZWxEdEASpdyj7bWlMUasW+vZpYi3kyubTlgE4OLE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388809AbgBNRvl (ORCPT ); Fri, 14 Feb 2020 12:51:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:43094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388692AbgBNP6r (ORCPT ); Fri, 14 Feb 2020 10:58:47 -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 53E2A222C4; Fri, 14 Feb 2020 15:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695927; bh=QfuO7T46To2INqXAS+MsM/KdnZqxbxpxWwbFcGzURAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HbASZw8GaP9PDpusnmO73JJVFeCNWwKOT2WE+0e5dRYrEnjjCzqufUvhJfT93N1+2 2AupSg/eWLB9kakpTm2G485QWRFtnGWqSRXMpgMLqfHYF3OxPM4qNlDiB4lvCTC1jW Fbbp0TVNhWFqgkWXJIE6Mc5+kAHfMV065e/dQ4L8= 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.5 463/542] jbd2: make sure ESHUTDOWN to be recorded in the journal superblock Date: Fri, 14 Feb 2020 10:47:35 -0500 Message-Id: <20200214154854.6746-463-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-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 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 8479e84159675..0b4280fcad91d 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2147,8 +2147,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