net: remove {revc,send}msg_copy_msghdr() from exports

The only user of these was io_uring, and it's not using them anymore.
Make them static and remove them from the socket header file.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/1b6089d3-c1cf-464a-abd3-b0f0b6bb2523@kernel.dk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/socket.h b/include/linux/socket.h
index cfcb7e2c3813f2dbd3fd5ca9d123a6883713d672..139c330ccf2c3bf995a0c05db14db4f286f7eab6 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
                               struct user_msghdr __user *umsg,
                               struct sockaddr __user *uaddr,
                               unsigned int flags);
-extern int sendmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct iovec **iov);
-extern int recvmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct sockaddr __user **uaddr,
-                              struct iovec **iov);
 extern int __copy_msghdr(struct msghdr *kmsg,
                         struct user_msghdr *umsg,
                         struct sockaddr __user **save_addr);

diff --git a/net/socket.c b/net/socket.c
index 7e9c8fc9a5b4545dcb2c2e423ef609bbd77e29f7..e5f3af49a8b6215189066cbc1481406661b594e5 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2600,9 +2600,9 @@ out:
        return err;
 }
 
-int sendmsg_copy_msghdr(struct msghdr *msg,
-                       struct user_msghdr __user *umsg, unsigned flags,
-                       struct iovec **iov)
+static int sendmsg_copy_msghdr(struct msghdr *msg,
+                              struct user_msghdr __user *umsg, unsigned flags,
+                              struct iovec **iov)
 {
        int err;
 
@@ -2753,10 +2753,10 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
        return __sys_sendmmsg(fd, mmsg, vlen, flags, true);
 }
 
-int recvmsg_copy_msghdr(struct msghdr *msg,
-                       struct user_msghdr __user *umsg, unsigned flags,
-                       struct sockaddr __user **uaddr,
-                       struct iovec **iov)
+static int recvmsg_copy_msghdr(struct msghdr *msg,
+                              struct user_msghdr __user *umsg, unsigned flags,
+                              struct sockaddr __user **uaddr,
+                              struct iovec **iov)
 {
        ssize_t err;
 

diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h
index cfcb7e2c3813f2dbd3fd5ca9d123a6883713d672..139c330ccf2c3bf995a0c05db14db4f286f7eab6 100644 (file)
--- a/tools/perf/trace/beauty/include/linux/socket.h
+++ b/tools/perf/trace/beauty/include/linux/socket.h
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
                               struct user_msghdr __user *umsg,
                               struct sockaddr __user *uaddr,
                               unsigned int flags);
-extern int sendmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct iovec **iov);
-extern int recvmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct sockaddr __user **uaddr,
-                              struct iovec **iov);
 extern int __copy_msghdr(struct msghdr *kmsg,
                         struct user_msghdr *umsg,
                         struct sockaddr __user **save_addr);