net: make __sys_accept4_file() static
Subsystems (3)
PATCH 1/1 net: make __sys_accept4_file() static
__sys_accept4_file() isn't used outside of the file, make it static.
As the same time, move file_flags and nofile parameters into __sys_accept4_file().
Signed-off-by Yajun Deng <[email protected]>
--- include/linux/socket.h | 4 ---- net/socket.c | 15 ++++++--------- 2 files changed, 6 insertions(+), 13 deletions(-)
include/linux/socket.h +0 -4
@@ -428,10 +428,6 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,extern int __sys_sendto (int fd,void __user *buff,size_t len,unsigned int flags,struct sockaddr __user *addr,int addr_len); -extern int __sys_accept4_file (struct file *file,unsigned file_flags, -struct sockaddr __user *upeer_sockaddr, -int __user *upeer_addrlen,int flags, -unsigned long nofile);extern struct file *do_accept (struct file *file,unsigned file_flags,struct sockaddr __user *upeer_sockaddr,int __user *upeer_addrlen,int flags);
net/socket.c +6 -9
@@ -1878,10 +1878,8 @@ struct file *do_accept(struct file *file, unsigned file_flags,return ERR_PTR (err); } -int __sys_accept4_file (struct file *file,unsigned file_flags, -struct sockaddr __user *upeer_sockaddr, -int __user *upeer_addrlen,int flags, -unsigned long nofile) +static int __sys_accept4_file (struct file *file,struct sockaddr __user *upeer_sockaddr, +int __user *upeer_addrlen,int flags) {struct file *newfile;int newfd;
@@ -1892,11 +1890,11 @@ int __sys_accept4_file(struct file *file, unsigned file_flags,if (SOCK_NONBLOCK !=O_NONBLOCK && (flags &SOCK_NONBLOCK )) flags = (flags & ~SOCK_NONBLOCK ) |O_NONBLOCK ; - newfd =__get_unused_fd_flags (flags, nofile); + newfd =get_unused_fd_flags (flags);if (unlikely (newfd <0 ))return newfd; - newfile =do_accept (file, file_flags, upeer_sockaddr, upeer_addrlen, + newfile =do_accept (file,0 , upeer_sockaddr, upeer_addrlen, flags);if (IS_ERR (newfile)) {put_unused_fd (newfd);
@@ -1926,9 +1924,8 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, f =fdget (fd);if (f.file) { - ret =__sys_accept4_file (f.file,0 , upeer_sockaddr, - upeer_addrlen, flags, -rlimit (RLIMIT_NOFILE )); + ret =__sys_accept4_file (f.file, upeer_sockaddr, + upeer_addrlen, flags);fdput (f); }
Signature · 1 line
2.25.1
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 10 Jun 2022 17:10:17 +0800 you wrote:
__sys_accept4_file()isn't used outside of the file, make it static.As the same time, move
file_flagsand nofile parameters into__sys_accept4_file().Signed-off-by Yajun Deng <[email protected]>[...]
Here is the summary with links:
- [net-next] net: make __sys_accept4_file() static
https://git.kernel.org/netdev/net-next/c/c04245328dd7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html