aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-11-23 14:03:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 12:59:14 -0800
commit1c4e871038f17769d943d4473c339171fed70f45 (patch)
treed91dbffdd5c5068898e955e33767f204a5354415 /fs/jbd
parentf6a8d4ccb6a92e815669e65dd1140280876f3bd1 (diff)
downloadkernel_samsung_smdk4412-1c4e871038f17769d943d4473c339171fed70f45.zip
kernel_samsung_smdk4412-1c4e871038f17769d943d4473c339171fed70f45.tar.gz
kernel_samsung_smdk4412-1c4e871038f17769d943d4473c339171fed70f45.tar.bz2
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>
Diffstat (limited to 'fs/jbd')
-rw-r--r--fs/jbd/transaction.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index b0161a6..d7ab092 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -1955,7 +1955,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;
}
/*