diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-15 23:41:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:47 -0700 |
| commit | 64d67d21773f1946ddc04aedc201f6c2f3ee1bfb (patch) | |
| tree | 4f95b3bfdcd9d7ec7ee068c26aa93f5d0bdd961d | |
| parent | 77ec739d8d0979477fc91f530403805afa2581a4 (diff) | |
| download | kernel_samsung_tuna-64d67d21773f1946ddc04aedc201f6c2f3ee1bfb.zip kernel_samsung_tuna-64d67d21773f1946ddc04aedc201f6c2f3ee1bfb.tar.gz kernel_samsung_tuna-64d67d21773f1946ddc04aedc201f6c2f3ee1bfb.tar.bz2 | |
revert "vanishing ioctl handler debugging"
Revert my do_ioctl() debugging patch: Paul fixed the bug.
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ioctl.c | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -12,7 +12,6 @@ #include <linux/fs.h> #include <linux/security.h> #include <linux/module.h> -#include <linux/kallsyms.h> #include <asm/uaccess.h> #include <asm/ioctls.h> @@ -21,7 +20,6 @@ static long do_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { int error = -ENOTTY; - void *f; if (!filp->f_op) goto out; @@ -31,16 +29,10 @@ static long do_ioctl(struct file *filp, unsigned int cmd, if (error == -ENOIOCTLCMD) error = -EINVAL; goto out; - } else if ((f = filp->f_op->ioctl)) { + } else if (filp->f_op->ioctl) { lock_kernel(); - if (!filp->f_op->ioctl) { - printk("%s: ioctl %p disappeared\n", __FUNCTION__, f); - print_symbol("symbol: %s\n", (unsigned long)f); - dump_stack(); - } else { - error = filp->f_op->ioctl(filp->f_path.dentry->d_inode, - filp, cmd, arg); - } + error = filp->f_op->ioctl(filp->f_path.dentry->d_inode, + filp, cmd, arg); unlock_kernel(); } |