Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ec116b authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer() 



OOM happens.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 3f0ca309

fs/jbd2/commit.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

fs/jbd2/journal.c

+4 −0
Original line number Diff line number Diff line
@@ -358,6 +358,10 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction, 


		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);