net: socket: drop unneeded likely() call around IS_ERR()
authorEnrico Weigelt <info@metux.net>
Wed, 5 Jun 2019 20:58:50 +0000 (22:58 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2019 23:57:23 +0000 (16:57 -0700)
IS_ERR() already calls unlikely(), so this extra likely() call
around the !IS_ERR() is not needed.

Signed-off-by: Enrico Weigelt <info@metux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/socket.c

index 72372dc5dd70e6e0d412724be1577456d993f4cd..0aa5a06f3698bd66cb1ace069cc95606d18c230e 100644 (file)
@@ -435,7 +435,7 @@ static int sock_map_fd(struct socket *sock, int flags)
        }
 
        newfile = sock_alloc_file(sock, flags, NULL);
-       if (likely(!IS_ERR(newfile))) {
+       if (!IS_ERR(newfile)) {
                fd_install(fd, newfile);
                return fd;
        }