Commit 25389bb2 authored Nov 23, 2012 by Jan Kara

jbd: Fix lock ordering bug in journal_unmap_buffer()

Commit 09e05d48 introduced a wait for transaction commit into
journal_unmap_buffer() in the case we are truncating a buffer undergoing commit
in the page stradding i_size on a filesystem with blocksize < pagesize. Sadly
we forgot to drop buffer lock before waiting for transaction commit and thus
deadlock is possible when kjournald wants to lock the buffer.

Fix the problem by dropping the buffer lock before waiting for transaction
commit. Since we are still holding page lock (and that is OK), buffer cannot
disappear under us.

CC: stable@vger.kernel.org # Wherever commit 09e05d48 was taken
Signed-off-by: Jan Kara <jack@suse.cz>

parent ae49eeec

fs/jbd/transaction.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1961,7 +1961,9 @@ retry:
		spin_unlock(&journal->j_list_lock);
		jbd_unlock_bh_state(bh);
		spin_unlock(&journal->j_state_lock);
		unlock_buffer(bh);
		log_wait_commit(journal, tid);
		lock_buffer(bh);
		goto retry;
		}
		/*

Admin message