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

Commit 45a90bfd authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

jbd2: Fix buffer head leak when writing the commit block 



Also make sure the buffer heads are marked clean before submitting bh
for writing.  The previous code was marking the buffer head dirty,
which would have forced an unneeded write (and seek) to the journal
for no good reason.

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

fs/jbd2/commit.c

+2 −3
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static int journal_submit_commit_record(journal_t *journal, 


	JBUFFER_TRACE(descriptor, "submit commit block");

	lock_buffer(bh);

	get_bh(bh);

	set_buffer_dirty(bh);

	clear_buffer_dirty(bh);

	set_buffer_uptodate(bh);

	bh->b_end_io = journal_end_buffer_io_sync;
@@ -158,7 +157,7 @@ static int journal_submit_commit_record(journal_t *journal, 
		/* And try again, without the barrier */

		lock_buffer(bh);

		set_buffer_uptodate(bh);

		set_buffer_dirty(bh);

		clear_buffer_dirty(bh);

		ret = submit_bh(WRITE, bh);

	}

	*cbh = bh;