The patch titled
Subject: ocfs2: do not BUG if jbd2_journal_dirty_metadata fails
has been removed from the -mm tree. Its filename was
ocfs2-do-not-bug-if-jbd2_journal_dirty_metadata-fails-v3.patch
This patch was dropped because it was folded into ocfs2-do-not-bug-if-jbd2_journal_dirty_metadata-fails.patch
------------------------------------------------------
From: Joseph Qi <joseph.qi@xxxxxxxxxx>
Subject: ocfs2: do not BUG if jbd2_journal_dirty_metadata fails
As Junxiao suggested, we also set filesystem read-only here.
Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx>
Cc: joyce.xue <xuejiufei@xxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/journal.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN fs/ocfs2/journal.c~ocfs2-do-not-bug-if-jbd2_journal_dirty_metadata-fails-v3 fs/ocfs2/journal.c
--- a/fs/ocfs2/journal.c~ocfs2-do-not-bug-if-jbd2_journal_dirty_metadata-fails-v3
+++ a/fs/ocfs2/journal.c
@@ -779,12 +779,14 @@ void ocfs2_journal_dirty(handle_t *handl
mlog_errno(status);
if (!is_handle_aborted(handle)) {
journal_t *journal = handle->h_transaction->t_journal;
+ struct super_block *sb = bh->b_bdev->bd_super;
mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. "
- "Aborting transaction and journal.");
+ "Aborting transaction and journal.\n");
handle->h_err = status;
jbd2_journal_abort_handle(handle);
jbd2_journal_abort(journal, status);
+ ocfs2_abort(sb, "Journal already aborted.\n");
}
}
}
_
Patches currently in -mm which might be from joseph.qi@xxxxxxxxxx are
ocfs2-fix-a-tiny-race-when-truncate-dio-orohaned-entry.patch
ocfs2-use-retval-instead-of-status-for-checking-error.patch
ocfs2-dlm-cleanup-unused-function-__dlm_wait_on_lockres_flags_set.patch
ocfs2-do-not-bug-if-jbd2_journal_dirty_metadata-fails.patch
ocfs2-o2net-should-remove-debugfs-in-o2net_init-out-branch.patch
ocfs2-fix-null-pointer-dereference-in-function-ocfs2_abort_trigger.patch
ocfs2-fix-null-pointer-dereference-in-function-ocfs2_abort_trigger-fix.patch
ocfs2-fix-wrong-check-in-ocfs2_direct_io_get_blocks.patch
ocfs2-mark-local-functions-as-static.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
