Commit 863b67e1 authored by Christoph Hellwig's avatar Christoph Hellwig

fs: remove ksys_ioctl

Fold it into the only remaining caller.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b25ba7c3
...@@ -736,7 +736,7 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd, ...@@ -736,7 +736,7 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
{ {
struct fd f = fdget(fd); struct fd f = fdget(fd);
int error; int error;
...@@ -757,11 +757,6 @@ int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -757,11 +757,6 @@ int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
return error; return error;
} }
SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
{
return ksys_ioctl(fd, cmd, arg);
}
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
/** /**
* compat_ptr_ioctl - generic implementation of .compat_ioctl file operation * compat_ptr_ioctl - generic implementation of .compat_ioctl file operation
......
...@@ -1241,7 +1241,6 @@ int ksys_chroot(const char __user *filename); ...@@ -1241,7 +1241,6 @@ int ksys_chroot(const char __user *filename);
ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count); ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count);
int ksys_chdir(const char __user *filename); int ksys_chdir(const char __user *filename);
int ksys_fchown(unsigned int fd, uid_t user, gid_t group); int ksys_fchown(unsigned int fd, uid_t user, gid_t group);
int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count); ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count);
void ksys_sync(void); void ksys_sync(void);
int ksys_unshare(unsigned long unshare_flags); int ksys_unshare(unsigned long unshare_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment