Merge tag 'io_uring-5.5-20191212' of git://git.kernel.dk/linux-block

[people/ms/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index b116e58d6438f12854392a8ced64cc8a812119d4..50623218747f067c0ecf33a51d8d6b61e39ce139 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2546,7 +2546,12 @@ static int ____sys_recvmsg(struct socket *sock, struct msghdr *msg_sys,
 
        if (sock->file->f_flags & O_NONBLOCK)
                flags |= MSG_DONTWAIT;
-       err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys, flags);
+
+       if (unlikely(nosec))
+               err = sock_recvmsg_nosec(sock, msg_sys, flags);
+       else
+               err = sock_recvmsg(sock, msg_sys, flags);
+
        if (err < 0)
                goto out;
        len = err;