Commit c0424532 authored by Yajun Deng's avatar Yajun Deng Committed by David S. Miller

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: default avatarYajun Deng <yajun.deng@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 219160be
...@@ -428,10 +428,6 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size, ...@@ -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, extern int __sys_sendto(int fd, void __user *buff, size_t len,
unsigned int flags, struct sockaddr __user *addr, unsigned int flags, struct sockaddr __user *addr,
int addr_len); 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, extern struct file *do_accept(struct file *file, unsigned file_flags,
struct sockaddr __user *upeer_sockaddr, struct sockaddr __user *upeer_sockaddr,
int __user *upeer_addrlen, int flags); int __user *upeer_addrlen, int flags);
......
...@@ -1878,10 +1878,8 @@ struct file *do_accept(struct file *file, unsigned file_flags, ...@@ -1878,10 +1878,8 @@ struct file *do_accept(struct file *file, unsigned file_flags,
return ERR_PTR(err); return ERR_PTR(err);
} }
int __sys_accept4_file(struct file *file, unsigned file_flags, static int __sys_accept4_file(struct file *file, struct sockaddr __user *upeer_sockaddr,
struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen, int flags)
int __user *upeer_addrlen, int flags,
unsigned long nofile)
{ {
struct file *newfile; struct file *newfile;
int newfd; int newfd;
...@@ -1892,11 +1890,11 @@ int __sys_accept4_file(struct file *file, unsigned file_flags, ...@@ -1892,11 +1890,11 @@ int __sys_accept4_file(struct file *file, unsigned file_flags,
if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
newfd = __get_unused_fd_flags(flags, nofile); newfd = get_unused_fd_flags(flags);
if (unlikely(newfd < 0)) if (unlikely(newfd < 0))
return newfd; return newfd;
newfile = do_accept(file, file_flags, upeer_sockaddr, upeer_addrlen, newfile = do_accept(file, 0, upeer_sockaddr, upeer_addrlen,
flags); flags);
if (IS_ERR(newfile)) { if (IS_ERR(newfile)) {
put_unused_fd(newfd); put_unused_fd(newfd);
...@@ -1926,9 +1924,8 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, ...@@ -1926,9 +1924,8 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
f = fdget(fd); f = fdget(fd);
if (f.file) { if (f.file) {
ret = __sys_accept4_file(f.file, 0, upeer_sockaddr, ret = __sys_accept4_file(f.file, upeer_sockaddr,
upeer_addrlen, flags, upeer_addrlen, flags);
rlimit(RLIMIT_NOFILE));
fdput(f); fdput(f);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment