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-13042 tests: give more time in sanity-selinux test_21b
[fs/lustre-release.git]
/
lnet
/
lnet
/
lib-socket.c
diff --git
a/lnet/lnet/lib-socket.c
b/lnet/lnet/lib-socket.c
index
0c9a640
..
642d8b5
100644
(file)
--- a/
lnet/lnet/lib-socket.c
+++ b/
lnet/lnet/lib-socket.c
@@
-177,7
+177,7
@@
EXPORT_SYMBOL(lnet_sock_read);
static int
lnet_sock_create(struct socket **sockp, int *fatal,
static int
lnet_sock_create(struct socket **sockp, int *fatal,
- __u32 local_ip, int local_port)
+ __u32 local_ip, int local_port
, struct net *ns
)
{
struct sockaddr_in locaddr;
struct socket *sock;
{
struct sockaddr_in locaddr;
struct socket *sock;
@@
-188,7
+188,7
@@
lnet_sock_create(struct socket **sockp, int *fatal,
*fatal = 1;
#ifdef HAVE_SOCK_CREATE_KERN_USE_NET
*fatal = 1;
#ifdef HAVE_SOCK_CREATE_KERN_USE_NET
- rc = sock_create_kern(
&init_net
, PF_INET, SOCK_STREAM, 0, &sock);
+ rc = sock_create_kern(
ns
, PF_INET, SOCK_STREAM, 0, &sock);
#else
rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
#endif
#else
rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
#endif
@@
-310,12
+310,12
@@
EXPORT_SYMBOL(lnet_sock_getbuf);
int
lnet_sock_listen(struct socket **sockp,
int
lnet_sock_listen(struct socket **sockp,
- __u32 local_ip, int local_port, int backlog)
+ __u32 local_ip, int local_port, int backlog
, struct net *ns
)
{
int fatal;
int rc;
{
int fatal;
int rc;
- rc = lnet_sock_create(sockp, &fatal, local_ip, local_port);
+ rc = lnet_sock_create(sockp, &fatal, local_ip, local_port
, ns
);
if (rc != 0) {
if (!fatal)
CERROR("Can't create socket: port %d already in use\n",
if (rc != 0) {
if (!fatal)
CERROR("Can't create socket: port %d already in use\n",
@@
-332,13
+332,6
@@
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)
{
@@
-389,12
+382,13
@@
failed:
int
lnet_sock_connect(struct socket **sockp, int *fatal,
__u32 local_ip, int local_port,
int
lnet_sock_connect(struct socket **sockp, int *fatal,
__u32 local_ip, int local_port,
- __u32 peer_ip, int peer_port)
+ __u32 peer_ip, int peer_port,
+ struct net *ns)
{
struct sockaddr_in srvaddr;
int rc;
{
struct sockaddr_in srvaddr;
int rc;
- rc = lnet_sock_create(sockp, fatal, local_ip, local_port);
+ rc = lnet_sock_create(sockp, fatal, local_ip, local_port
, ns
);
if (rc != 0)
return rc;
if (rc != 0)
return rc;