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 <yajun.deng@linux.dev> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
219160be49
Коммит
c04245328d
|
@ -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);
|
||||
|
|
15
net/socket.c
15
net/socket.c
|
@ -1878,10 +1878,8 @@ out_fd:
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче