Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4121 tests: Enable zfs tests dependent on ost,mgs ordering
[fs/lustre-release.git]
/
lnet
/
lnet
/
lib-socket.c
diff --git
a/lnet/lnet/lib-socket.c
b/lnet/lnet/lib-socket.c
index
0b6fc00
..
7d0dcbd
100644
(file)
--- 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
*
* 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
*/
*
* 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 201
2, 2014
, Intel Corporation.
+ * Copyright (c) 201
5, 2016
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* 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
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;
}
sock_release(sock);
goto out;
}
@@
-202,9
+198,9
@@
lnet_ipif_enumerate(char ***namesp)
nalloc = 16; /* first guess at max interfaces */
toobig = 0;
for (;;) {
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;
toobig = 1;
- nalloc = PAGE_
CACHE_SIZE/
sizeof(*ifr);
+ nalloc = PAGE_
SIZE /
sizeof(*ifr);
CWARN("Too many interfaces: only enumerating "
"first %d\n", nalloc);
}
CWARN("Too many interfaces: only enumerating "
"first %d\n", nalloc);
}
@@
-554,6
+550,13
@@
lnet_sock_listen(struct socket **sockp,
return rc;
}
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)
{
int
lnet_sock_accept(struct socket **newsockp, struct socket *sock)
{