diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-04 00:15:10 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-14 00:24:24 +0200 |
| commit | b19dd42faf413b4705d4adb38521e82d73fa4249 (patch) | |
| tree | fbfdea065c3772b2de2c37238af6afcad2e42934 /fs/compat_ioctl.c | |
| parent | c6d7ba8b12636923f3e30997dec69bed58e176b6 (diff) | |
| download | linux-b19dd42faf413b4705d4adb38521e82d73fa4249.tar.gz | |
bkl: Remove locked .ioctl file operation
The last user is gone, so we can safely remove this Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: John Kacur <jkacur@redhat.com> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 70227e0dc01d..03e59aa318eb 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1699,8 +1699,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, goto out_fput; } - if (!filp->f_op || - (!filp->f_op->ioctl && !filp->f_op->unlocked_ioctl)) + if (!filp->f_op || !filp->f_op->unlocked_ioctl) goto do_ioctl; break; } |