ocfs2: do not BUG if jbd2_journal_dirty_metadata fails

jbd2_journal_dirty_metadata may fail.  Currently it cannot take care of
non zero return value and just BUG in ocfs2_journal_dirty.  This patch is
aborting the handle and journal instead of BUG.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: joyce.xue <xuejiufei@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4205da06000d9b7ec63620ed7fdb73b5c831d567..72db49c0e2ab1742b7149d5d700c28151d05222d 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -775,7 +775,20 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)
        trace_ocfs2_journal_dirty((unsigned long long)bh->b_blocknr);
 
        status = jbd2_journal_dirty_metadata(handle, bh);
-       BUG_ON(status);
+       if (status) {
+               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.\n");
+                       handle->h_err = status;
+                       jbd2_journal_abort_handle(handle);
+                       jbd2_journal_abort(journal, status);
+                       ocfs2_abort(sb, "Journal already aborted.\n");
+               }
+       }
 }
 
 #define OCFS2_DEFAULT_COMMIT_INTERVAL  (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE)