]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerJan Kara <jack@suse.cz>
Fri, 23 Nov 2012 14:17:18 +0000 (15:17 +0100)
commit84460a930cd6c18f6a4aa3fcf3e94899be64b65d
tree84700b2e4697a4d51265e90b8b0ccac9e2ef485d
parent6609a93d452656b081e8224e3633fb616c23cf46
jbd: Fix lock ordering bug in journal_unmap_buffer()

Commit 16be38a6 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 16be38a6 was taken
Signed-off-by: Jan Kara <jack@suse.cz>
fs/jbd/transaction.c