[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20191122060129.4239-67-sashal@kernel.org>
Date: Fri, 22 Nov 2019 01:01:06 -0500
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Junxiao Bi <junxiao.bi@...cle.com>,
Yiwen Jiang <jiangyiwen@...wei.com>,
Joseph Qi <jiangqi903@...il.com>,
Jun Piao <piaojun@...wei.com>,
Changwei Ge <ge.changwei@....com>,
Joel Becker <jlbec@...lplan.org>,
Mark Fasheh <mfasheh@...sity.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Sasha Levin <sashal@...nel.org>, ocfs2-devel@....oracle.com
Subject: [PATCH AUTOSEL 4.9 68/91] ocfs2: clear journal dirty flag after shutdown journal
From: Junxiao Bi <junxiao.bi@...cle.com>
[ 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 <junxiao.bi@...cle.com>
Reviewed-by: Yiwen Jiang <jiangyiwen@...wei.com>
Reviewed-by: Joseph Qi <jiangqi903@...il.com>
Cc: Jun Piao <piaojun@...wei.com>
Cc: Changwei Ge <ge.changwei@....com>
Cc: Joel Becker <jlbec@...lplan.org>
Cc: Mark Fasheh <mfasheh@...sity.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
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
Powered by blists - more mailing lists