aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEnrico Weigelt <info@metux.net>2019-06-05 22:58:50 +0200
committerDavid S. Miller <davem@davemloft.net>2019-06-05 16:57:23 -0700
commit4546e44ca2ec6fa3ca971ab6de3ef382f17ed544 (patch)
treee05f60c382b45461a0a8a89ae38a727974dc6ca1 /net
parentnfp: flower: use struct_size() helper (diff)
downloadlinux-dev-4546e44ca2ec6fa3ca971ab6de3ef382f17ed544.tar.xz
linux-dev-4546e44ca2ec6fa3ca971ab6de3ef382f17ed544.zip
net: socket: drop unneeded likely() call around IS_ERR()
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>
Diffstat (limited to 'net')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 72372dc5dd70..0aa5a06f3698 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -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;
}