Introduce new top level suspend and hibernation callbacks

[linux-2.6-omap-h63xx.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 0ac6b92cb0b6365a19a7d4c337362a97b320a0a6..11dbf08651b70861d31530ef73436dc2e3beffc1 100644 (file)
--- 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) {