| From fa1b33dd4ff545b7bfd10eac8b0833d338135306 Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Tue, 1 Dec 2009 09:04:42 -0500 |
| Subject: [PATCH 76/85] jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer() |
| |
| (cherry picked from commit e6ec116b67f46e0e7808276476554727b2e6240b) |
| |
| OOM happens. |
| |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/jbd2/commit.c | 4 ++++ |
| fs/jbd2/journal.c | 4 ++++ |
| 2 files changed, 8 insertions(+) |
| |
| --- a/fs/jbd2/commit.c |
| +++ b/fs/jbd2/commit.c |
| @@ -636,6 +636,10 @@ void jbd2_journal_commit_transaction(jou |
| JBUFFER_TRACE(jh, "ph3: write metadata"); |
| flags = jbd2_journal_write_metadata_buffer(commit_transaction, |
| jh, &new_jh, blocknr); |
| + if (flags < 0) { |
| + jbd2_journal_abort(journal, flags); |
| + continue; |
| + } |
| set_bit(BH_JWrite, &jh2bh(new_jh)->b_state); |
| wbuf[bufs++] = jh2bh(new_jh); |
| |
| --- a/fs/jbd2/journal.c |
| +++ b/fs/jbd2/journal.c |
| @@ -361,6 +361,10 @@ repeat: |
| |
| jbd_unlock_bh_state(bh_in); |
| tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS); |
| + if (!tmp) { |
| + jbd2_journal_put_journal_head(new_jh); |
| + return -ENOMEM; |
| + } |
| jbd_lock_bh_state(bh_in); |
| if (jh_in->b_frozen_data) { |
| jbd2_free(tmp, bh_in->b_size); |