diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dcache.c | 1 | ||||
-rw-r--r-- | fs/locks.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 9e5cd3c3a6ba..a100fa35a48f 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/swap.h> | 32 | #include <linux/swap.h> |
33 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
34 | #include <linux/fs_struct.h> | 34 | #include <linux/fs_struct.h> |
35 | #include <linux/hardirq.h> | ||
35 | #include "internal.h" | 36 | #include "internal.h" |
36 | 37 | ||
37 | int sysctl_vfs_cache_pressure __read_mostly = 100; | 38 | int sysctl_vfs_cache_pressure __read_mostly = 100; |
diff --git a/fs/locks.c b/fs/locks.c index 52366e877d76..19ee18a6829b 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -768,7 +768,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) | |||
768 | * give it the opportunity to lock the file. | 768 | * give it the opportunity to lock the file. |
769 | */ | 769 | */ |
770 | if (found) | 770 | if (found) |
771 | cond_resched_bkl(); | 771 | cond_resched(); |
772 | 772 | ||
773 | find_conflict: | 773 | find_conflict: |
774 | for_each_lock(inode, before) { | 774 | for_each_lock(inode, before) { |