ext4, jbd2: ensure panic when aborting with zero errno

[linux.git] / fs / jbd2 / journal.c

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 5f9edb12f11a459c9271c95ceb224994d55ec12b..9e9275540071a7d703ef8775274d38dff8dfd692 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2156,12 +2156,10 @@ static void __journal_abort_soft (journal_t *journal, int errno)
 
        __jbd2_journal_abort_hard(journal);
 
-       if (errno) {
-               jbd2_journal_update_sb_errno(journal);
-               write_lock(&journal->j_state_lock);
-               journal->j_flags |= JBD2_REC_ERR;
-               write_unlock(&journal->j_state_lock);
-       }
+       jbd2_journal_update_sb_errno(journal);
+       write_lock(&journal->j_state_lock);
+       journal->j_flags |= JBD2_REC_ERR;
+       write_unlock(&journal->j_state_lock);
 }
 
 /**
@@ -2203,11 +2201,6 @@ static void __journal_abort_soft (journal_t *journal, int errno)
  * failure to disk.  ext3_error, for example, now uses this
  * functionality.
  *
- * Errors which originate from within the journaling layer will NOT
- * supply an errno; a null errno implies that absolutely no further
- * writes are done to the journal (unless there are any already in
- * progress).
- *
  */
 
 void jbd2_journal_abort(journal_t *journal, int errno)