Merge branch 'svn-trunk'

iscsi-scst/kernel/Kconfig

@@ -23,3 +23,5 @@ config SCST_ISCSI_DEBUG_DIGEST_FAILURES
 	  iSCSI initiator that is talking to SCST.
 
 	  If unsure, say "N".
+
+source "drivers/scst/iscsi-scst/isert-scst/Kconfig"

iscsi-scst/kernel/Makefile.in-kernel

@@ -1,4 +1,4 @@
 iscsi-scst-y := iscsi.o nthread.o config.o digest.o \
-	conn.o session.o target.o event.o param.o
+	conn.o session.o target.o event.o param.o iscsit_transport.o
 
-obj-$(CONFIG_SCST_ISCSI) += iscsi-scst.o
+obj-$(CONFIG_SCST_ISCSI) += iscsi-scst.o isert-scst/

iscsi-scst/kernel/conn.c

@@ -17,10 +17,13 @@
 #include <linux/file.h>
 #include <linux/ip.h>
 #include <net/tcp.h>
-
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/iscsit_transport.h>
+#else
+#include "iscsit_transport.h"
+#endif
 #include "iscsi.h"
 #include "digest.h"
-#include "iscsit_transport.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 #if defined(CONFIG_LOCKDEP) && !defined(CONFIG_SCST_PROC)

iscsi-scst/kernel/iscsi.c

@@ -23,10 +23,13 @@
 #include <scsi/scsi.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
-
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/iscsit_transport.h>
+#else
+#include "iscsit_transport.h"
+#endif
 #include "iscsi.h"
 #include "digest.h"
-#include "iscsit_transport.h"
 
 #if 0 && !defined(GENERATING_UPSTREAM_PATCH)
 #if !defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)

iscsi-scst/kernel/iscsi.h

@@ -26,13 +26,14 @@
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/scst.h>
 #include <scst/iscsi_scst.h>
+#include <scst/iscsit_transport.h>
 #else
 #include <scst.h>
 #include "iscsi_scst.h"
+#include "iscsit_transport.h"
 #endif
 #include "iscsi_hdr.h"
 #include "iscsi_dbg.h"
-#include "iscsit_transport.h"
 
 #define iscsi_sense_crc_error			ABORTED_COMMAND, 0x47, 0x05
 #define iscsi_sense_unexpected_unsolicited_data	ABORTED_COMMAND, 0x0C, 0x0C

iscsi-scst/kernel/iscsit_transport.c

@@ -1,6 +1,10 @@
 
 #include <linux/spinlock.h>
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/iscsit_transport.h>
+#else
 #include "iscsit_transport.h"
+#endif
 #include "iscsi.h"
 
 static LIST_HEAD(transport_list);

iscsi-scst/kernel/isert-scst/Kconfig

@@ -1,8 +1,9 @@
 config SCST_ISER
-	tristate "ISCSI Target"
+	tristate "iSER Target Driver"
 	depends on SCST && SCST_ISCSI
 	default SCST
 	help
 	  ISER target driver for SCST framework. The iSCSI iSER extension
 	  has been defined in RFC 5046.
 
+	  If unsure, say "N".

iscsi-scst/kernel/isert-scst/Makefile

@@ -25,7 +25,7 @@ cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
 enable-Wextra = $(shell uname_r="$$(uname -r)"; if [ "$${uname_r%.el5}" = "$${uname_r}" ]; then echo "$(1)"; fi)
 
 LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
-EXTRA_CFLAGS += -I$(src)/../../include -I$(src)/../ -I$(SCST_INC_DIR)
+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)

iscsi-scst/kernel/isert-scst/iser_datamover.h

@@ -36,7 +36,7 @@
 #ifndef __ISER_DATAMOVER_H__
 #define __ISER_DATAMOVER_H__
 
-#include "iscsi.h"
+#include "../iscsi.h"
 
 /* iscsi layer calling iser */
 int isert_datamover_init(void);

iscsi-scst/kernel/isert-scst/iser_hdr.h

@@ -36,7 +36,7 @@
 #ifndef __ISER_HDR_H__
 #define __ISER_HDR_H__
 
-#include "iscsi.h"
+#include "../iscsi.h"
 
 #define ISCSI_LOGIN_MAX_RDSL      (8 * 1024)
 

iscsi-scst/kernel/isert-scst/iser_pdu.c

@@ -38,7 +38,7 @@
 #include <linux/kernel.h>
 
 #include "iser.h"
-#include "iscsi.h"
+#include "../iscsi.h"
 #include "iser_datamover.h"
 
 static inline int isert_pdu_rx_buf_init(struct isert_cmnd *isert_pdu,

iscsi-scst/kernel/isert-scst/isert.c

@@ -37,9 +37,13 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/iscsit_transport.h>
+#else
+#include "iscsit_transport.h"
+#endif
 #include "isert.h"
 #include "isert_dbg.h"
-#include "iscsit_transport.h"
 #include "iser_datamover.h"
 
 #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)

iscsi-scst/kernel/isert-scst/isert.h

@@ -54,12 +54,11 @@
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/isert_scst.h>
 #include <scst/iscsi_scst.h>
-#include <scst/iscsi.h>
 #else
 #include "isert_scst.h"
 #include "iscsi_scst.h"
-#include "iscsi.h"
 #endif
+#include "../iscsi.h"
 
 #include "iser_hdr.h"
 

iscsi-scst/kernel/isert-scst/isert_login.c

@@ -40,13 +40,7 @@
 #include <linux/poll.h>
 #include <linux/freezer.h>
 #include <linux/file.h>
-
-#ifdef INSIDE_KERNEL_TREE
-#include <scst/iscsi.h>
-#else
-#include "iscsi.h"
-#endif
-
+#include "../iscsi.h"
 #include "isert.h"
 #include "isert_dbg.h"
 #include "iser_datamover.h"

iscsi-scst/kernel/nthread.c

@@ -20,10 +20,13 @@
 #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <net/tcp_states.h>
-
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/iscsit_transport.h>
+#else
+#include "iscsit_transport.h"
+#endif
 #include "iscsi.h"
 #include "digest.h"
-#include "iscsit_transport.h"
 
 /* Read data states */
 enum rx_state {

scripts/generate-kernel-patch

@@ -462,7 +462,7 @@ do
       "iscsi-scst/include/iscsi_scst_itf_ver.h")
           ;;
       "iscsi-scst/include/iscsit_transport.h")
-          add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/include/}"
+          add_file "${f}" "include/scst/${f#iscsi-scst/include/}"
           ;;
       *)
           add_file "${f}" "include/scst/${f#iscsi-scst/include/}"
@@ -484,8 +484,10 @@ done
 
 for f in $(ls iscsi-scst/kernel/isert-scst/*.[ch] 2>/dev/null)
 do
-  add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/isert-scst/}"
+  add_file "${f}" "drivers/scst/iscsi-scst/isert-scst/${f#iscsi-scst/kernel/isert-scst/}"
 done
+add_file "iscsi-scst/kernel/isert-scst/Makefile.in-kernel" "drivers/scst/iscsi-scst/isert-scst/Makefile"
+add_file "iscsi-scst/kernel/isert-scst/Kconfig" "drivers/scst/iscsi-scst/isert-scst/Kconfig"
 ) \
 | process_patch "iscsi-scst.diff"