Merge branch 'io_uring-zerocopy-send' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 82af388..b6bd4cf 100644 (file)
--- a/net/socket.c
+++ b/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);
        }