X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Flocks.c;h=11dbf08651b70861d31530ef73436dc2e3beffc1;hb=64e9159f5d2c4edf5fa6425031e556f8fddaf7e6;hp=0ac6b92cb0b6365a19a7d4c337362a97b320a0a6;hpb=1da7807842f7ccd9a3962dc276e489b76cd320c7;p=linux-2.6-omap-h63xx.git

diff --git a/fs/locks.c b/fs/locks.c
index 0ac6b92cb0b..11dbf08651b 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) {