diff --git a/[refs] b/[refs] index f654ae9aeb54..3818a40f0fd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60c11d2abf4ef811d0ce3ea34279746729c4c6fc +refs/heads/master: d1645e526a1e5842c9ac433d73419ba886676cf3 diff --git a/trunk/fs/jbd/commit.c b/trunk/fs/jbd/commit.c index ae08c057e751..f1ea861b9929 100644 --- a/trunk/fs/jbd/commit.c +++ b/trunk/fs/jbd/commit.c @@ -762,6 +762,9 @@ void journal_commit_transaction(journal_t *journal) /* AKPM: bforget here */ } + if (err) + journal_abort(journal, err); + jbd_debug(3, "JBD: commit phase 6\n"); if (journal_write_commit_record(journal, commit_transaction))