Skip to content
Snippets Groups Projects
Commit 60d2981b authored by Doug Oucharek's avatar Doug Oucharek Committed by Oleg Drokin
Browse files

LU-9456 lnd: Change sock_create() to sock_create_kern()


Changing all calls in the ksocklnd from sock_create() to
sock_create_kern().

Signed-off-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Change-Id: Ib8b175e73478b1edfb5e8cd3491e589e8267f52a
Reviewed-on: https://review.whamcloud.com/26958


Tested-by: Jenkins
Tested-by: default avatarMaloo <hpdd-maloo@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOlaf Weber <olaf.weber@hpe.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
parent 645153be
No related branches found
No related tags found
No related merge requests found
...@@ -681,6 +681,27 @@ tcp_sendpage_socket, [ ...@@ -681,6 +681,27 @@ tcp_sendpage_socket, [
EXTRA_KCFLAGS="$tmp_flags" EXTRA_KCFLAGS="$tmp_flags"
]) # LN_CONFIG_TCP_SENDPAGE ]) # LN_CONFIG_TCP_SENDPAGE
# LN_CONFIG_SOCK_CREATE_KERN
#
# 4.x sock_create_kern() added a first parameter as 'struct net *'
# instead of int.
#
AC_DEFUN([LN_CONFIG_SOCK_CREATE_KERN], [
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
LB_CHECK_COMPILE([if 'sock_create_kern' first parameter is net],
sock_create_kern_net, [
#include <linux/net.h>
#include <net/net_namespace.h>
],[
sock_create_kern((struct net*)0, 0, 0, 0, NULL);
],[
AC_DEFINE(HAVE_SOCK_CREATE_KERN_USE_NET, 1,
[sock_create_kern use net as first parameter])
])
EXTRA_KCFLAGS="$tmp_flags"
]) # LN_CONFIG_SOCK_CREATE_KERN
# #
# LN_CONFIG_SK_DATA_READY # LN_CONFIG_SK_DATA_READY
# #
...@@ -719,6 +740,8 @@ LN_CONFIG_GNILND ...@@ -719,6 +740,8 @@ LN_CONFIG_GNILND
LN_CONFIG_SK_SLEEP LN_CONFIG_SK_SLEEP
# 2.6.36 # 2.6.36
LN_CONFIG_TCP_SENDPAGE LN_CONFIG_TCP_SENDPAGE
# 4.x
LN_CONFIG_SOCK_CREATE_KERN
# 3.15 # 3.15
LN_CONFIG_SK_DATA_READY LN_CONFIG_SK_DATA_READY
]) # LN_PROG_LINUX ]) # LN_PROG_LINUX
......
...@@ -64,7 +64,11 @@ lnet_sock_ioctl(int cmd, unsigned long arg) ...@@ -64,7 +64,11 @@ lnet_sock_ioctl(int cmd, unsigned long arg)
int fd = -1; int fd = -1;
int rc; int rc;
rc = sock_create(PF_INET, SOCK_STREAM, 0, &sock); #ifdef HAVE_SOCK_CREATE_KERN_USE_NET
rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock);
#else
rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
#endif
if (rc != 0) { if (rc != 0) {
CERROR("Can't create socket: %d\n", rc); CERROR("Can't create socket: %d\n", rc);
return rc; return rc;
...@@ -413,7 +417,11 @@ lnet_sock_create(struct socket **sockp, int *fatal, ...@@ -413,7 +417,11 @@ lnet_sock_create(struct socket **sockp, int *fatal,
/* All errors are fatal except bind failure if the port is in use */ /* All errors are fatal except bind failure if the port is in use */
*fatal = 1; *fatal = 1;
rc = sock_create(PF_INET, SOCK_STREAM, 0, &sock); #ifdef HAVE_SOCK_CREATE_KERN_USE_NET
rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock);
#else
rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
#endif
*sockp = sock; *sockp = sock;
if (rc != 0) { if (rc != 0) {
CERROR("Can't create socket: %d\n", rc); CERROR("Can't create socket: %d\n", rc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment