X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Flocks.c;h=11dbf08651b70861d31530ef73436dc2e3beffc1;hb=2ddfd20e7c55421435cbf95a5ed3dd6e423cf934;hp=0ac6b92cb0b6365a19a7d4c337362a97b320a0a6;hpb=0f1bce41fed02e45f31c2409f29e69e1fedebcdc;p=linux-2.6

diff --git a/fs/locks.c b/fs/locks.c
index 0ac6b92cb0..11dbf08651 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -773,7 +773,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
 	 * give it the opportunity to lock the file.
 	 */
 	if (found)
-		cond_resched();
+		cond_resched_bkl();
 
 find_conflict:
 	for_each_lock(inode, before) {