From 5b3369267827113e580df0fb0886043cb3e8c013 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 9 Sep 2010 15:27:54 +0000 Subject: [PATCH] More upstream include path conversions. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2076 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/Makefile_in-tree | 2 -- fcst/fcst.h | 4 ++++ ibmvstgt/src/ibmvstgt.c | 4 ++++ ibmvstgt/src/libsrpnew.c | 4 ++++ iscsi-scst/kernel/Makefile.in-kernel | 2 -- iscsi-scst/kernel/event.c | 4 ++++ iscsi-scst/kernel/iscsi.h | 9 ++++++--- iscsi-scst/kernel/iscsi_dbg.h | 4 ++++ iscsi-scst/usr/iscsid.h | 6 +++++- mpt/in-tree/Makefile | 3 +-- mpt/mpt_scst.c | 6 +++++- mvsas_tgt/mv_tgt.h | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 | 2 +- scst/kernel/in-tree/Makefile.scst-2.6.35 | 2 +- scst/src/dev_handlers/scst_cdrom.c | 4 ++++ scst/src/dev_handlers/scst_changer.c | 4 ++++ scst/src/dev_handlers/scst_disk.c | 4 ++++ scst/src/dev_handlers/scst_modisk.c | 4 ++++ scst/src/dev_handlers/scst_processor.c | 4 ++++ scst/src/dev_handlers/scst_raid.c | 4 ++++ scst/src/dev_handlers/scst_tape.c | 4 ++++ scst/src/dev_handlers/scst_user.c | 5 +++++ scst/src/dev_handlers/scst_vdisk.c | 4 ++++ scst/src/scst_debug.c | 5 +++++ scst/src/scst_lib.c | 5 ++++- scst/src/scst_main.c | 4 ++++ scst/src/scst_mem.c | 4 ++++ scst/src/scst_pres.c | 5 +++++ scst/src/scst_priv.h | 4 ++++ scst/src/scst_proc.c | 4 ++++ scst/src/scst_sysfs.c | 4 ++++ scst/src/scst_targ.c | 4 ++++ scst_local/in-tree/Makefile-2.6.35 | 4 ---- scst_local/scst_local.c | 13 +++++++++---- 34 files changed, 128 insertions(+), 22 deletions(-) diff --git a/fcst/Makefile_in-tree b/fcst/Makefile_in-tree index a9c003efc..1c387231d 100644 --- a/fcst/Makefile_in-tree +++ b/fcst/Makefile_in-tree @@ -1,5 +1,3 @@ -ccflags-y += -Iinclude/scst - obj-$(CONFIG_FCST) += fcst.o fcst-objs := \ diff --git a/fcst/fcst.h b/fcst/fcst.h index e349c2297..11b52fa9c 100644 --- a/fcst/fcst.h +++ b/fcst/fcst.h @@ -19,7 +19,11 @@ #ifndef __SCSI_FCST_H__ #define __SCSI_FCST_H__ +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #define FT_VERSION "0.3" #define FT_MODULE "fcst" diff --git a/ibmvstgt/src/ibmvstgt.c b/ibmvstgt/src/ibmvstgt.c index e1995e7f7..da0d3bfdc 100644 --- a/ibmvstgt/src/ibmvstgt.c +++ b/ibmvstgt/src/ibmvstgt.c @@ -27,7 +27,11 @@ #include #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include #include #ifdef __powerpc__ diff --git a/ibmvstgt/src/libsrpnew.c b/ibmvstgt/src/libsrpnew.c index ec58a5fb6..0072ff143 100644 --- a/ibmvstgt/src/libsrpnew.c +++ b/ibmvstgt/src/libsrpnew.c @@ -29,7 +29,11 @@ #include #include #include "libsrpnew.h" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif enum srp_task_attributes { SRP_SIMPLE_TASK = 0, diff --git a/iscsi-scst/kernel/Makefile.in-kernel b/iscsi-scst/kernel/Makefile.in-kernel index 59b34767c..003cda418 100644 --- a/iscsi-scst/kernel/Makefile.in-kernel +++ b/iscsi-scst/kernel/Makefile.in-kernel @@ -1,5 +1,3 @@ -EXTRA_CFLAGS += -Iinclude/scst - iscsi-scst-y := iscsi.o nthread.o config.o digest.o \ conn.o session.o target.o event.o param.o diff --git a/iscsi-scst/kernel/event.c b/iscsi-scst/kernel/event.c index c9dacc003..bf3dea082 100644 --- a/iscsi-scst/kernel/event.c +++ b/iscsi-scst/kernel/event.c @@ -17,7 +17,11 @@ */ #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "iscsi_scst.h" +#endif #include "iscsi.h" static struct sock *nl; diff --git a/iscsi-scst/kernel/iscsi.h b/iscsi-scst/kernel/iscsi.h index 37d90c148..945959de2 100644 --- a/iscsi-scst/kernel/iscsi.h +++ b/iscsi-scst/kernel/iscsi.h @@ -22,11 +22,14 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include - -#include "iscsi_hdr.h" #include "iscsi_scst.h" - +#endif +#include "iscsi_hdr.h" #include "iscsi_dbg.h" #define iscsi_sense_crc_error ABORTED_COMMAND, 0x47, 0x05 diff --git a/iscsi-scst/kernel/iscsi_dbg.h b/iscsi-scst/kernel/iscsi_dbg.h index 8f9abab0b..56eae5295 100644 --- a/iscsi-scst/kernel/iscsi_dbg.h +++ b/iscsi-scst/kernel/iscsi_dbg.h @@ -18,7 +18,11 @@ #define LOG_PREFIX "iscsi-scst" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include +#endif #define TRACE_D_WRITE 0x80000000 #define TRACE_CONN_OC 0x40000000 diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h index fa84bba9f..6d761ffa8 100644 --- a/iscsi-scst/usr/iscsid.h +++ b/iscsi-scst/usr/iscsid.h @@ -24,8 +24,12 @@ #include #include "types.h" -#include "iscsi_hdr.h" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "iscsi_scst.h" +#endif +#include "iscsi_hdr.h" #include "param.h" #include "misc.h" diff --git a/mpt/in-tree/Makefile b/mpt/in-tree/Makefile index 0b1e55289..b1c99bac4 100644 --- a/mpt/in-tree/Makefile +++ b/mpt/in-tree/Makefile @@ -1,6 +1,5 @@ -SCST_INC_DIR := include/scst FUSION_INC_DIR := drivers/message/fusion -EXTRA_CFLAGS += -I$(SCST_INC_DIR) -I$(FUSION_INC_DIR) -Iinclude/scsi +EXTRA_CFLAGS += -I$(FUSION_INC_DIR) -Iinclude/scsi EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING diff --git a/mpt/mpt_scst.c b/mpt/mpt_scst.c index 5fe52937d..a07a38792 100644 --- a/mpt/mpt_scst.c +++ b/mpt/mpt_scst.c @@ -36,9 +36,13 @@ #include #endif +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include "scst.h" - #include +#endif #include "mpt_scst.h" diff --git a/mvsas_tgt/mv_tgt.h b/mvsas_tgt/mv_tgt.h index 9b13ec44b..8da4f0923 100644 --- a/mvsas_tgt/mv_tgt.h +++ b/mvsas_tgt/mv_tgt.h @@ -25,8 +25,13 @@ #ifdef SUPPORT_TARGET #ifndef _MVSAST_H #define _MVSAST_H +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include "scst.h" #include "scst_debug.h" +#endif #include "mv_sas.h" struct mvs_info; diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 index fc6f8e7fa..9657aee84 100644 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 @@ -1,4 +1,4 @@ -ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx +ccflags-y += -Idrivers/scsi/qla2xxx qla2x00tgt-y := qla2x00t.o diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.35 b/scst/kernel/in-tree/Makefile.scst-2.6.35 index e95e98fe4..df4312ba2 100644 --- a/scst/kernel/in-tree/Makefile.scst-2.6.35 +++ b/scst/kernel/in-tree/Makefile.scst-2.6.35 @@ -1,4 +1,4 @@ -ccflags-y += -Iinclude/scst -Wno-unused-parameter +ccflags-y += -Wno-unused-parameter scst-y += scst_main.o scst-y += scst_pres.o diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c index 7fba2c035..972b64896 100644 --- a/scst/src/dev_handlers/scst_cdrom.c +++ b/scst/src/dev_handlers/scst_cdrom.c @@ -24,7 +24,11 @@ #define LOG_PREFIX "dev_cdrom" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" #define CDROM_NAME "dev_cdrom" diff --git a/scst/src/dev_handlers/scst_changer.c b/scst/src/dev_handlers/scst_changer.c index 0e88ec66e..0f1a57de3 100644 --- a/scst/src/dev_handlers/scst_changer.c +++ b/scst/src/dev_handlers/scst_changer.c @@ -23,7 +23,11 @@ #define LOG_PREFIX "dev_changer" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" #define CHANGER_NAME "dev_changer" diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c index 044923cdd..77cacec0c 100644 --- a/scst/src/dev_handlers/scst_disk.c +++ b/scst/src/dev_handlers/scst_disk.c @@ -28,7 +28,11 @@ #define LOG_PREFIX "dev_disk" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" # define DISK_NAME "dev_disk" diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c index 14fad5e32..90abf14e1 100644 --- a/scst/src/dev_handlers/scst_modisk.c +++ b/scst/src/dev_handlers/scst_modisk.c @@ -28,7 +28,11 @@ #define LOG_PREFIX "dev_modisk" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" # define MODISK_NAME "dev_modisk" diff --git a/scst/src/dev_handlers/scst_processor.c b/scst/src/dev_handlers/scst_processor.c index b178ae836..c2910af60 100644 --- a/scst/src/dev_handlers/scst_processor.c +++ b/scst/src/dev_handlers/scst_processor.c @@ -23,7 +23,11 @@ #define LOG_PREFIX "dev_processor" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" #define PROCESSOR_NAME "dev_processor" diff --git a/scst/src/dev_handlers/scst_raid.c b/scst/src/dev_handlers/scst_raid.c index 86e46f1e7..fd4dfcc24 100644 --- a/scst/src/dev_handlers/scst_raid.c +++ b/scst/src/dev_handlers/scst_raid.c @@ -23,7 +23,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" #define RAID_NAME "dev_raid" diff --git a/scst/src/dev_handlers/scst_tape.c b/scst/src/dev_handlers/scst_tape.c index 70b9289ae..0a2909bf3 100644 --- a/scst/src/dev_handlers/scst_tape.c +++ b/scst/src/dev_handlers/scst_tape.c @@ -28,7 +28,11 @@ #define LOG_PREFIX "dev_tape" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_dev_handler.h" # define TAPE_NAME "dev_tape" diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c index b83f4e354..2b281d95c 100644 --- a/scst/src/dev_handlers/scst_user.c +++ b/scst/src/dev_handlers/scst_user.c @@ -25,8 +25,13 @@ #define LOG_PREFIX DEV_USER_NAME +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include "scst.h" #include "scst_user.h" +#endif #include "scst_dev_handler.h" #if defined(CONFIG_HIGHMEM4G) || defined(CONFIG_HIGHMEM64G) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 372001871..c1b87cc44 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -45,7 +45,11 @@ #define LOG_PREFIX "dev_vdisk" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) diff --git a/scst/src/scst_debug.c b/scst/src/scst_debug.c index 1d136d918..296c60d3f 100644 --- a/scst/src/scst_debug.c +++ b/scst/src/scst_debug.c @@ -19,8 +19,13 @@ * GNU General Public License for more details. */ +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include "scst.h" #include "scst_debug.h" +#endif #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 156ad68d1..2c5346027 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -32,10 +32,13 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_mem.h" - #include "scst_pres.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c index cf504a244..852e54010 100644 --- a/scst/src/scst_main.c +++ b/scst/src/scst_main.c @@ -30,7 +30,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_mem.h" #include "scst_pres.h" diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c index cc9ba24f7..b0da819d9 100644 --- a/scst/src/scst_mem.c +++ b/scst/src/scst_mem.c @@ -26,7 +26,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_mem.h" diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c index 947c9aa36..67b1f8820 100644 --- a/scst/src/scst_pres.c +++ b/scst/src/scst_pres.c @@ -50,8 +50,13 @@ #include #endif +#ifdef INSIDE_KERNEL_TREE +#include +#include +#else #include "scst.h" #include "scst_const.h" +#endif #include "scst_priv.h" #include "scst_pres.h" diff --git a/scst/src/scst_priv.h b/scst/src/scst_priv.h index 3cbf13aad..f2858e80b 100644 --- a/scst/src/scst_priv.h +++ b/scst/src/scst_priv.h @@ -33,7 +33,11 @@ #define LOG_PREFIX "scst" +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst_debug.h" +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) #define SCST_MAJOR 177 diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c index 3be42a9a4..1c446f3fc 100644 --- a/scst/src/scst_proc.c +++ b/scst/src/scst_proc.c @@ -30,7 +30,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_mem.h" #include "scst_pres.h" diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index 6978fbe22..4334772e4 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -25,7 +25,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_mem.h" #include "scst_pres.h" diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 7c70674db..0675f412c 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -30,7 +30,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst.h" +#endif #include "scst_priv.h" #include "scst_pres.h" diff --git a/scst_local/in-tree/Makefile-2.6.35 b/scst_local/in-tree/Makefile-2.6.35 index ec5e0320c..8cbbbff63 100644 --- a/scst_local/in-tree/Makefile-2.6.35 +++ b/scst_local/in-tree/Makefile-2.6.35 @@ -1,6 +1,2 @@ -SCST_INC_DIR := include/scst -SCST_DIR := drivers/scst -ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR) - obj-$(CONFIG_SCST_LOCAL) += scst_local.o diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index da5d52089..03a4f8da3 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -30,13 +30,18 @@ #include #include -/* SCST includes ... */ -#include -#include - #define LOG_PREFIX "scst_local" +/* SCST includes ... */ +#ifdef INSIDE_KERNEL_TREE +#include +#include +#include +#else +#include +#include #include +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) #define SG_MAX_SINGLE_ALLOC (PAGE_SIZE / sizeof(struct scatterlist))