import PULS_20180308

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / ext4 / ext4_jbd2.c

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 1be3996b5942f7c4dd6706bf93e3bac69cc36123..3517d5af257437c2033c15d536301e1b499c0206 100644 (file)
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -75,8 +75,14 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle)
                ext4_put_nojournal(handle);
                return 0;
        }
-       sb = handle->h_transaction->t_journal->j_private;
+
        err = handle->h_err;
+       if (!handle->h_transaction) {
+               rc = jbd2_journal_stop(handle);
+               return err ? err : rc;
+       }
+
+       sb = handle->h_transaction->t_journal->j_private;
        rc = jbd2_journal_stop(handle);
 
        if (!err)