diff options
author | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 11:12:01 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 17:06:28 -0400 |
commit | a238b790d5f99c7832f9b73ac8847025815b85f7 (patch) | |
tree | 2fd07ceeec7d56eb4af295488407b501c6d6fbb8 /fs/fcntl.c | |
parent | 2db9f0a35a4e4ad7cee756a4e0dabb7c1c8b6c72 (diff) |
Call fasync() functions without the BKL
lock_kernel() calls have been pushed down into code which needs it, so
there is no need to take the BKL at this level anymore.
This work inspired and aided by Andi Kleen's unlocked_fasync() patches.
Acked-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index bfd776509a72..330a7d782591 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/fdtable.h> | 12 | #include <linux/fdtable.h> |
13 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
14 | #include <linux/dnotify.h> | 14 | #include <linux/dnotify.h> |
15 | #include <linux/smp_lock.h> | ||
16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
18 | #include <linux/security.h> | 17 | #include <linux/security.h> |
@@ -227,7 +226,6 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
227 | if (error) | 226 | if (error) |
228 | return error; | 227 | return error; |
229 | 228 | ||
230 | lock_kernel(); | ||
231 | if ((arg ^ filp->f_flags) & FASYNC) { | 229 | if ((arg ^ filp->f_flags) & FASYNC) { |
232 | if (filp->f_op && filp->f_op->fasync) { | 230 | if (filp->f_op && filp->f_op->fasync) { |
233 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); | 231 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); |
@@ -238,7 +236,6 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
238 | 236 | ||
239 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); | 237 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); |
240 | out: | 238 | out: |
241 | unlock_kernel(); | ||
242 | return error; | 239 | return error; |
243 | } | 240 | } |
244 | 241 | ||