X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-socket.c;h=7d0dcbd1bcb0075f7a75cd05a9b7b6c321341edb;hb=8c5d21639ae3628a398ff5556ed90b58d41c456b;hp=0b6fc00ed365d68a36cd6b2f3b8557e5060c5519;hpb=9002fabc81f6cb1c467c5b89548161579fcd48f6;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c
index 0b6fc00..7d0dcbd 100644
--- a/lnet/lnet/lib-socket.c
+++ b/lnet/lnet/lib-socket.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2015, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -89,8 +85,8 @@ lnet_sock_ioctl(int cmd, unsigned long arg)
 	sock_filp = sock_alloc_file(sock, 0);
 # endif
 #endif
-	if (!sock_filp) {
-		rc = -ENOMEM;
+	if (IS_ERR(sock_filp)) {
+		rc = PTR_ERR(sock_filp);
 		sock_release(sock);
 		goto out;
 	}
@@ -202,9 +198,9 @@ lnet_ipif_enumerate(char ***namesp)
 	nalloc = 16;	/* first guess at max interfaces */
 	toobig = 0;
 	for (;;) {
-		if (nalloc * sizeof(*ifr) > PAGE_CACHE_SIZE) {
+		if (nalloc * sizeof(*ifr) > PAGE_SIZE) {
 			toobig = 1;
-			nalloc = PAGE_CACHE_SIZE/sizeof(*ifr);
+			nalloc = PAGE_SIZE / sizeof(*ifr);
 			CWARN("Too many interfaces: only enumerating "
 			      "first %d\n", nalloc);
 		}
@@ -554,6 +550,13 @@ lnet_sock_listen(struct socket **sockp,
 	return rc;
 }
 
+#ifndef HAVE_SK_SLEEP
+static inline wait_queue_head_t *sk_sleep(struct sock *sk)
+{
+	return sk->sk_sleep;
+}
+#endif
+
 int
 lnet_sock_accept(struct socket **newsockp, struct socket *sock)
 {