Skip to content

Commit 863b67e

Browse files
author
Christoph Hellwig
committed
fs: remove ksys_ioctl
Fold it into the only remaining caller. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Linus Torvalds <[email protected]>
1 parent b25ba7c commit 863b67e

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

fs/ioctl.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,
736736
return -ENOIOCTLCMD;
737737
}
738738

739-
int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
739+
SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
740740
{
741741
struct fd f = fdget(fd);
742742
int error;
@@ -757,11 +757,6 @@ int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
757757
return error;
758758
}
759759

760-
SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
761-
{
762-
return ksys_ioctl(fd, cmd, arg);
763-
}
764-
765760
#ifdef CONFIG_COMPAT
766761
/**
767762
* compat_ptr_ioctl - generic implementation of .compat_ioctl file operation

include/linux/syscalls.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,6 @@ int ksys_chroot(const char __user *filename);
12411241
ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count);
12421242
int ksys_chdir(const char __user *filename);
12431243
int ksys_fchown(unsigned int fd, uid_t user, gid_t group);
1244-
int ksys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
12451244
ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count);
12461245
void ksys_sync(void);
12471246
int ksys_unshare(unsigned long unshare_flags);

0 commit comments

Comments
 (0)