summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-10-16 02:25:25 +0200
committerArnd Bergmann <arnd@arndb.de>2009-12-10 22:52:08 +0100
commit348c4b9078ba8d9bef2e453c7ded07fde4748c79 (patch)
tree27ba0332ccec257e2e69d02875da6d32f2153540
parentfb07a5f857ac8a2035d3f642317b0119b1056a7f (diff)
downloadlinux-348c4b9078ba8d9bef2e453c7ded07fde4748c79.tar.gz
linux-348c4b9078ba8d9bef2e453c7ded07fde4748c79.tar.bz2
linux-348c4b9078ba8d9bef2e453c7ded07fde4748c79.zip
compat_ioctl: Remove BKL
We have always called ioctl conversion handlers under the big kernel lock, although that is generally not necessary. In particular it is not needed for conversion of data structures and for calling sys_ioctl or do_vfs_ioctl, which will get the BKL again if needed. Handlers doing more than those two have been moved out, so we can kill off the BKL from compat_sys_ioctl. This may significantly improve latencies with 32 bit applications, and it avoids a common scenario where a thread acquires the BKL twice. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 6ad1c56a6c0e..a383424f1b25 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1918,9 +1918,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
found_handler:
if (t->handler) {
- lock_kernel();
error = t->handler(fd, cmd, arg, filp);
- unlock_kernel();
goto out_fput;
}