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

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

include/linux/socket.h

+0 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

	}