From 9732e4fd927cb8824f26ba8414aec2eb16e3089d Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Thu, 22 Aug 2013 14:02:34 +0000 Subject: [PATCH] Move the old iSCSI initiator source to a more appropriate place (sys/dev/iscsi_initiator/ instead of sys/dev/iscsi/initiator/), to make room for the new one. This is also more logical location (kernel module being named iscsi_initiator.ko, for example). There is no ongoing work on this I know of, so it shouldn't make life harder for anyone. There are no functional changes, apart from "svn mv" and adjusting paths. --- sbin/iscontrol/auth_subr.c | 2 +- sbin/iscontrol/config.c | 2 +- sbin/iscontrol/fsm.c | 2 +- sbin/iscontrol/iscontrol.c | 2 +- sbin/iscontrol/login.c | 2 +- sbin/iscontrol/misc.c | 2 +- sbin/iscontrol/pdu.c | 2 +- sys/conf/files | 12 ++++++------ .../{iscsi/initiator => iscsi_initiator}/isc_cam.c | 4 ++-- .../{iscsi/initiator => iscsi_initiator}/isc_sm.c | 4 ++-- .../{iscsi/initiator => iscsi_initiator}/isc_soc.c | 4 ++-- .../{iscsi/initiator => iscsi_initiator}/isc_subr.c | 4 ++-- sys/dev/{iscsi/initiator => iscsi_initiator}/iscsi.c | 4 ++-- sys/dev/{iscsi/initiator => iscsi_initiator}/iscsi.h | 0 .../initiator => iscsi_initiator}/iscsi_subr.c | 4 ++-- .../{iscsi/initiator => iscsi_initiator}/iscsivar.h | 0 sys/modules/Makefile | 2 +- .../{iscsi/initiator => iscsi_initiator}/Makefile | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) rename sys/dev/{iscsi/initiator => iscsi_initiator}/isc_cam.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/isc_sm.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/isc_soc.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/isc_subr.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/iscsi.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/iscsi.h (100%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/iscsi_subr.c (99%) rename sys/dev/{iscsi/initiator => iscsi_initiator}/iscsivar.h (100%) rename sys/modules/{iscsi/initiator => iscsi_initiator}/Makefile (85%) diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c index 9ced1d7bae40..5f8292985a84 100644 --- a/sbin/iscontrol/auth_subr.c +++ b/sbin/iscontrol/auth_subr.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" static int diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c index 6307f66ca95e..e8fd309071ee 100644 --- a/sbin/iscontrol/config.c +++ b/sbin/iscontrol/config.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" /* diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c index 794fb8b119c4..a4660bb21af5 100644 --- a/sbin/iscontrol/fsm.c +++ b/sbin/iscontrol/fsm.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" typedef enum { diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c index c6ce21c70b11..2e8f2ea44502 100644 --- a/sbin/iscontrol/iscontrol.c +++ b/sbin/iscontrol/iscontrol.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" static char version[] = "2.3.1"; // keep in sync with iscsi_initiator diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c index 76937a8f3264..92bbc64b7bbe 100644 --- a/sbin/iscontrol/login.c +++ b/sbin/iscontrol/login.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" static char *status_class1[] = { diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c index 1f9dd1288cc9..b6fe6dffb6a0 100644 --- a/sbin/iscontrol/misc.c +++ b/sbin/iscontrol/misc.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" static inline char diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c index c4d3a2a2556b..7ce90eaa203c 100644 --- a/sbin/iscontrol/pdu.c +++ b/sbin/iscontrol/pdu.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "iscontrol.h" static void pukeText(char *it, pdu_t *pp); diff --git a/sys/conf/files b/sys/conf/files index c149fddf479d..6b811f3bbbc8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1521,12 +1521,12 @@ ipw_monitor.fw optional ipwmonitorfw | ipwfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "ipw_monitor.fw" -dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus -dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_soc.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_sm.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_subr.c optional iscsi_initiator scbus +dev/iscsi_initiator/iscsi.c optional iscsi_initiator scbus +dev/iscsi_initiator/iscsi_subr.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_cam.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_soc.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_sm.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_subr.c optional iscsi_initiator scbus dev/isf/isf.c optional isf dev/isf/isf_fdt.c optional isf fdt dev/isf/isf_nexus.c optional isf diff --git a/sys/dev/iscsi/initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c similarity index 99% rename from sys/dev/iscsi/initiator/isc_cam.c rename to sys/dev/iscsi_initiator/isc_cam.c index ee0171c09bc9..c3ddd26802a5 100644 --- a/sys/dev/iscsi/initiator/isc_cam.c +++ b/sys/dev/iscsi_initiator/isc_cam.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include static void _inq(struct cam_sim *sim, union ccb *ccb) diff --git a/sys/dev/iscsi/initiator/isc_sm.c b/sys/dev/iscsi_initiator/isc_sm.c similarity index 99% rename from sys/dev/iscsi/initiator/isc_sm.c rename to sys/dev/iscsi_initiator/isc_sm.c index 7f47e9fdaa05..84f809ad22de 100644 --- a/sys/dev/iscsi/initiator/isc_sm.c +++ b/sys/dev/iscsi_initiator/isc_sm.c @@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include static void _async(isc_session_t *sp, pduq_t *pq) diff --git a/sys/dev/iscsi/initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c similarity index 99% rename from sys/dev/iscsi/initiator/isc_soc.c rename to sys/dev/iscsi_initiator/isc_soc.c index 947aadce0750..94650fd79eb1 100644 --- a/sys/dev/iscsi/initiator/isc_soc.c +++ b/sys/dev/iscsi_initiator/isc_soc.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #ifndef NO_USE_MBUF #define USE_MBUF diff --git a/sys/dev/iscsi/initiator/isc_subr.c b/sys/dev/iscsi_initiator/isc_subr.c similarity index 99% rename from sys/dev/iscsi/initiator/isc_subr.c rename to sys/dev/iscsi_initiator/isc_subr.c index d7f0d2754dcd..677c5f1674c8 100644 --- a/sys/dev/iscsi/initiator/isc_subr.c +++ b/sys/dev/iscsi_initiator/isc_subr.c @@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include static MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options"); diff --git a/sys/dev/iscsi/initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c similarity index 99% rename from sys/dev/iscsi/initiator/iscsi.c rename to sys/dev/iscsi_initiator/iscsi.c index 3737b7fdabbc..4dbf16349903 100644 --- a/sys/dev/iscsi/initiator/iscsi.c +++ b/sys/dev/iscsi_initiator/iscsi.c @@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include static char *iscsi_driver_version = "2.3.1"; static struct isc_softc *isc; diff --git a/sys/dev/iscsi/initiator/iscsi.h b/sys/dev/iscsi_initiator/iscsi.h similarity index 100% rename from sys/dev/iscsi/initiator/iscsi.h rename to sys/dev/iscsi_initiator/iscsi.h diff --git a/sys/dev/iscsi/initiator/iscsi_subr.c b/sys/dev/iscsi_initiator/iscsi_subr.c similarity index 99% rename from sys/dev/iscsi/initiator/iscsi_subr.c rename to sys/dev/iscsi_initiator/iscsi_subr.c index 013b16e12479..b22ed831207b 100644 --- a/sys/dev/iscsi/initiator/iscsi_subr.c +++ b/sys/dev/iscsi_initiator/iscsi_subr.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include /* | Interface to the SCSI layer diff --git a/sys/dev/iscsi/initiator/iscsivar.h b/sys/dev/iscsi_initiator/iscsivar.h similarity index 100% rename from sys/dev/iscsi/initiator/iscsivar.h rename to sys/dev/iscsi_initiator/iscsivar.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index bd263e9a9174..b95c77b0e1b1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -159,7 +159,7 @@ SUBDIR= \ ${_ipw} \ ${_ipwfw} \ ${_isci} \ - iscsi \ + iscsi_initiator \ isp \ ${_ispfw} \ ${_iwi} \ diff --git a/sys/modules/iscsi/initiator/Makefile b/sys/modules/iscsi_initiator/Makefile similarity index 85% rename from sys/modules/iscsi/initiator/Makefile rename to sys/modules/iscsi_initiator/Makefile index 3295c7b6f517..0ae7aa4b9738 100644 --- a/sys/modules/iscsi/initiator/Makefile +++ b/sys/modules/iscsi_initiator/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iscsi/initiator +.PATH: ${.CURDIR}/../../dev/iscsi_initiator KMOD=iscsi_initiator SRCS= iscsi.h iscsivar.h