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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Dec 2012 19:47:10 +0000 (11:47 -0800)
commitacaf0ed4bdd03d31d0df0bf33816bdaceecbe7cc
tree6ec616b99cca30ccae514b3e95f3a48ebc7cae55
parentc9fa3f41a91e5c279968e5c9962b578aca003c98
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/jbd/transaction.c