diff options
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index d4cfd6d2779e..6a10238d2c63 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -286,7 +286,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal, | |||
286 | if (err) { | 286 | if (err) { |
287 | /* | 287 | /* |
288 | * Because AS_EIO is cleared by | 288 | * Because AS_EIO is cleared by |
289 | * wait_on_page_writeback_range(), set it again so | 289 | * filemap_fdatawait_range(), set it again so |
290 | * that user process can get -EIO from fsync(). | 290 | * that user process can get -EIO from fsync(). |
291 | */ | 291 | */ |
292 | set_bit(AS_EIO, | 292 | set_bit(AS_EIO, |
@@ -636,6 +636,10 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
636 | JBUFFER_TRACE(jh, "ph3: write metadata"); | 636 | JBUFFER_TRACE(jh, "ph3: write metadata"); |
637 | flags = jbd2_journal_write_metadata_buffer(commit_transaction, | 637 | flags = jbd2_journal_write_metadata_buffer(commit_transaction, |
638 | jh, &new_jh, blocknr); | 638 | jh, &new_jh, blocknr); |
639 | if (flags < 0) { | ||
640 | jbd2_journal_abort(journal, flags); | ||
641 | continue; | ||
642 | } | ||
639 | set_bit(BH_JWrite, &jh2bh(new_jh)->b_state); | 643 | set_bit(BH_JWrite, &jh2bh(new_jh)->b_state); |
640 | wbuf[bufs++] = jh2bh(new_jh); | 644 | wbuf[bufs++] = jh2bh(new_jh); |
641 | 645 | ||