git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Blackfin: fix BF522/BF523 max VCO mixup
[safe/jmp/linux-2.6]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
52366e8
..
19ee18a
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-768,7
+768,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
_bkl
();
+ cond_resched();
find_conflict:
for_each_lock(inode, before) {