Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 38eec1583f6dae49d4c59ed1ded8c7d1805f9435..963df5dbdd5408c641b9a94e66af359c9a3f3baf 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -429,7 +429,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;
        }