kill kernel_sock_ioctl()

no users since 2014

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/linux/net.h b/include/linux/net.h
index caeb159abda508580dfe4fa15940f36e51bdd1e8..68acc54976bffc58bb60442ab032fe41b924a6af 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -306,7 +306,6 @@ int kernel_sendpage(struct socket *sock, struct page *page, int offset,
                    size_t size, int flags);
 int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,
                           size_t size, int flags);
-int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
 int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);
 
 /* Routine returns the IP overhead imposed by a (caller-protected) socket. */

diff --git a/net/socket.c b/net/socket.c
index 45d51555ce478a7309558c6aa8e6d531527df795..11cc2cd0f37b802c300d1eb563f756f91ff5ae7c 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -3245,19 +3245,6 @@ int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,
 }
 EXPORT_SYMBOL(kernel_sendpage_locked);
 
-int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg)
-{
-       mm_segment_t oldfs = get_fs();
-       int err;
-
-       set_fs(KERNEL_DS);
-       err = sock->ops->ioctl(sock, cmd, arg);
-       set_fs(oldfs);
-
-       return err;
-}
-EXPORT_SYMBOL(kernel_sock_ioctl);
-
 int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how)
 {
        return sock->ops->shutdown(sock, how);