mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-12-19 17:55:17 -08:00
parent bd263918a7 9b33ce46bb
commit 8376aea247
6 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/Makefile
+8 -1
View File
@@ -131,7 +131,8 @@ PRE_CFLAGS = $(OFED_CFLAGS) \
mods: include/iscsi_scst_itf_ver.h Modules.symvers Module.symvers \
$(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) modules
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
PRE_CFLAGS="$(PRE_CFLAGS)" modules
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
echo " Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
@@ -306,6 +307,12 @@ conftest/register_mad_agent/result-$(KVER).txt: \
echo "$(call run_conftest,register_mad_agent, \
-DREGISTER_MAD_AGENT_HAS_FLAGS_ARG)" >"$@"
conftest/sock_recvmsg/result-$(KVER).txt: \
conftest/sock_recvmsg/sock_recvmsg.c \
conftest/sock_recvmsg/Makefile
echo "$(call run_conftest_bool,sock_recvmsg, \
SOCK_RECVMSG_HAS_FOUR_ARGS)" >"$@"
conftest/use_pre_440_wr_structure/result-$(KVER).txt: \
conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c \
conftest/use_pre_440_wr_structure/Makefile
iscsi-scst/conftest/sock_recvmsg/Makefile
+3
View File
@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += sock_recvmsg.o
iscsi-scst/conftest/sock_recvmsg/sock_recvmsg.c
+11
View File
@@ -0,0 +1,11 @@
#include <linux/module.h>
#include <linux/net.h>
static int modinit(void)
{
int (*f)(struct socket *, struct msghdr *, size_t, int) = sock_recvmsg;
return f != NULL;
}
module_init(modinit);
iscsi-scst/kernel/Makefile
+1
View File
@@ -28,6 +28,7 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR)
EXTRA_CFLAGS += $(call enable-Wextra,-Wextra \
$(call cc-option,-Wno-old-style-declaration) \
-Wno-unused-parameter -Wno-missing-field-initializers)
EXTRA_CFLAGS += $(PRE_CFLAGS)
EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
iscsi-scst/kernel/nthread.c
+1 -1
View File
@@ -728,7 +728,7 @@ restart:
oldfs = get_fs();
set_fs(get_ds());
res = sock_recvmsg(conn->sock, msg,
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
#if SOCK_RECVMSG_HAS_FOUR_ARGS
read_size,
#endif
MSG_DONTWAIT | MSG_NOSIGNAL);
scripts/specialize-patch
+4
View File
@@ -66,6 +66,9 @@ function evaluate(stmnt, pattern, arg, op, result) {
gsub("defined\\(REGISTER_MAD_AGENT_HAS_FLAGS_ARG\\)",
"(LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))", stmnt)
gsub("SOCK_RECVMSG_HAS_FOUR_ARGS",
"(LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))", stmnt)
gsub("defined\\(USE_PRE_440_WR_STRUCTURE\\)",
"(LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0))", stmnt)
@@ -364,6 +367,7 @@ function handle_if(evaluated)
|| $0 ~ "RHEL_MAJOR" \
|| $0 ~ "RHEL_MINOR" \
|| $0 ~ "RHEL_RELEASE_CODE" \
|| $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
|| $0 ~ "USE_PRE_440_WR_STRUCTURE" \
|| generating_upstream_patch_defined \
&& $0 ~ "GENERATING_UPSTREAM_PATCH" \