Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64d67d21773f1946ddc04aedc201f6c2f3ee1bfb

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 77ec739d8d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 11 deletions Side-by-side Diff

... ... @@ -12,7 +12,6 @@
12 12 #include <linux/fs.h>
13 13 #include <linux/security.h>
14 14 #include <linux/module.h>
15   -#include <linux/kallsyms.h>
16 15  
17 16 #include <asm/uaccess.h>
18 17 #include <asm/ioctls.h>
... ... @@ -21,7 +20,6 @@
21 20 unsigned long arg)
22 21 {
23 22 int error = -ENOTTY;
24   - void *f;
25 23  
26 24 if (!filp->f_op)
27 25 goto out;
28 26  
... ... @@ -31,16 +29,10 @@
31 29 if (error == -ENOIOCTLCMD)
32 30 error = -EINVAL;
33 31 goto out;
34   - } else if ((f = filp->f_op->ioctl)) {
  32 + } else if (filp->f_op->ioctl) {
35 33 lock_kernel();
36   - if (!filp->f_op->ioctl) {
37   - printk("%s: ioctl %p disappeared\n", __FUNCTION__, f);
38   - print_symbol("symbol: %s\n", (unsigned long)f);
39   - dump_stack();
40   - } else {
41   - error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
42   - filp, cmd, arg);
43   - }
  34 + error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
  35 + filp, cmd, arg);
44 36 unlock_kernel();
45 37 }
46 38