diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-12-01 09:04:42 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-12-01 09:04:42 -0500 |
| commit | e6ec116b67f46e0e7808276476554727b2e6240b (patch) | |
| tree | ef80d636a8d45ff7779532e493916e2873adf390 /fs/jbd2 | |
| parent | 3f0ca309858ee186435c608ee9eaafd1c8dcb53a (diff) | |
| download | linux-3.10-e6ec116b67f46e0e7808276476554727b2e6240b.tar.gz linux-3.10-e6ec116b67f46e0e7808276476554727b2e6240b.tar.bz2 linux-3.10-e6ec116b67f46e0e7808276476554727b2e6240b.zip | |
jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
OOM happens.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/commit.c | 4 | ||||
| -rw-r--r-- | fs/jbd2/journal.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index d4cfd6d2779..8896c1d4feb 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -636,6 +636,10 @@ void jbd2_journal_commit_transaction(journal_t *journal) 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); diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index af60d98ddd2..3f473faa466 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -358,6 +358,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); |