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,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 B8402C432C0 for ; Fri, 22 Nov 2019 06:04:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D4062068E for ; Fri, 22 Nov 2019 06:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402697; bh=bX5shF6z+hdjvDopTiIOMnMFS00lNoa2FlAure1pDjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LKssXlUY77CYsHKewksIYwsHfQXQnPKPQrFE6KgIdCs1yjC29Q8pbDS7LqeflOnfa h/P/fp/WOGYLzUJD15xnRthOTtIZs+zs6q2jIBCoqebhLi5N1iejnWvFqDZM3O1BrE Je8zzmzRmAjCX3QUm4mAaNXCpEGAQxyg3ZeOXpsQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728803AbfKVGE4 (ORCPT ); Fri, 22 Nov 2019 01:04:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:41570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729805AbfKVGCt (ORCPT ); Fri, 22 Nov 2019 01:02:49 -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 3B1DA2071F; Fri, 22 Nov 2019 06:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402564; bh=bX5shF6z+hdjvDopTiIOMnMFS00lNoa2FlAure1pDjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j4spl8yquHv4YUE0Dg6hvpEfbv1NKTVUC32p7vpQrSCIvm+aftBfuCOvDm3RXa6xr xUmLQhxjF/53cShzj+qFINC01ZMGEdrSTuXgYgHmp+FlnWvr4Tz8MzDxUMETRF34LE 0FMUugADhjqdODdCBDT9OFAZIeasE2tykIrXXrkM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Junxiao Bi , Yiwen Jiang , Joseph Qi , Jun Piao , Changwei Ge , Joel Becker , Mark Fasheh , Andrew Morton , Linus Torvalds , Sasha Levin , ocfs2-devel@oss.oracle.com Subject: [PATCH AUTOSEL 4.9 68/91] ocfs2: clear journal dirty flag after shutdown journal Date: Fri, 22 Nov 2019 01:01:06 -0500 Message-Id: <20191122060129.4239-67-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122060129.4239-1-sashal@kernel.org> References: <20191122060129.4239-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: Junxiao Bi [ Upstream commit d85400af790dba2aa294f0a77e712f166681f977 ] Dirty flag of the journal should be cleared at the last stage of umount, if do it before jbd2_journal_destroy(), then some metadata in uncommitted transaction could be lost due to io error, but as dirty flag of journal was already cleared, we can't find that until run a full fsck. This may cause system panic or other corruption. Link: http://lkml.kernel.org/r/20181121020023.3034-3-junxiao.bi@oracle.com Signed-off-by: Junxiao Bi Reviewed-by: Yiwen Jiang Reviewed-by: Joseph Qi Cc: Jun Piao Cc: Changwei Ge Cc: Joel Becker Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/ocfs2/journal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index a30f63623db70..13cf69aa4cae8 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1018,7 +1018,8 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) mlog_errno(status); } - if (status == 0) { + /* Shutdown the kernel journal system */ + if (!jbd2_journal_destroy(journal->j_journal) && !status) { /* * Do not toggle if flush was unsuccessful otherwise * will leave dirty metadata in a "clean" journal @@ -1027,9 +1028,6 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) if (status < 0) mlog_errno(status); } - - /* Shutdown the kernel journal system */ - jbd2_journal_destroy(journal->j_journal); journal->j_journal = NULL; OCFS2_I(inode)->ip_open_count--; -- 2.20.1