Skip to content

Commit e54e09c

Browse files
axboekuba-moo
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e30cef0 commit e54e09c

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

include/linux/socket.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
422422
struct user_msghdr __user *umsg,
423423
struct sockaddr __user *uaddr,
424424
unsigned int flags);
425-
extern int sendmsg_copy_msghdr(struct msghdr *msg,
426-
struct user_msghdr __user *umsg, unsigned flags,
427-
struct iovec **iov);
428-
extern int recvmsg_copy_msghdr(struct msghdr *msg,
429-
struct user_msghdr __user *umsg, unsigned flags,
430-
struct sockaddr __user **uaddr,
431-
struct iovec **iov);
432425
extern int __copy_msghdr(struct msghdr *kmsg,
433426
struct user_msghdr *umsg,
434427
struct sockaddr __user **save_addr);

net/socket.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2600,9 +2600,9 @@ static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys,
26002600
return err;
26012601
}
26022602

2603-
int sendmsg_copy_msghdr(struct msghdr *msg,
2604-
struct user_msghdr __user *umsg, unsigned flags,
2605-
struct iovec **iov)
2603+
static int sendmsg_copy_msghdr(struct msghdr *msg,
2604+
struct user_msghdr __user *umsg, unsigned flags,
2605+
struct iovec **iov)
26062606
{
26072607
int err;
26082608

@@ -2753,10 +2753,10 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
27532753
return __sys_sendmmsg(fd, mmsg, vlen, flags, true);
27542754
}
27552755

2756-
int recvmsg_copy_msghdr(struct msghdr *msg,
2757-
struct user_msghdr __user *umsg, unsigned flags,
2758-
struct sockaddr __user **uaddr,
2759-
struct iovec **iov)
2756+
static int recvmsg_copy_msghdr(struct msghdr *msg,
2757+
struct user_msghdr __user *umsg, unsigned flags,
2758+
struct sockaddr __user **uaddr,
2759+
struct iovec **iov)
27602760
{
27612761
ssize_t err;
27622762

tools/perf/trace/beauty/include/linux/socket.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
422422
struct user_msghdr __user *umsg,
423423
struct sockaddr __user *uaddr,
424424
unsigned int flags);
425-
extern int sendmsg_copy_msghdr(struct msghdr *msg,
426-
struct user_msghdr __user *umsg, unsigned flags,
427-
struct iovec **iov);
428-
extern int recvmsg_copy_msghdr(struct msghdr *msg,
429-
struct user_msghdr __user *umsg, unsigned flags,
430-
struct sockaddr __user **uaddr,
431-
struct iovec **iov);
432425
extern int __copy_msghdr(struct msghdr *kmsg,
433426
struct user_msghdr *umsg,
434427
struct sockaddr __user **save_addr);

0 commit comments

Comments
 (0)