jbd: Fix lock ordering bug in journal_unmap_buffer()
authorJan Kara <jack@suse.cz>
Fri, 23 Nov 2012 13:03:04 +0000 (14:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 6 Dec 2012 11:20:35 +0000 (11:20 +0000)
commit3b830a12b24fcfd9d241de936b9b11e3b23e9c23
tree274488d62998864f0db465dd64933bd023a2f6e2
parent32eb44e290d1151e9eb26f57564dae6966190685
jbd: Fix lock ordering bug in journal_unmap_buffer()

commit 25389bb207987b5774182f763b9fb65ff08761c8 upstream.

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.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/jbd/transaction.c