svn commit: r254657 - in head: sbin/iscontrol sys/conf sys/dev/iscsi/initiator sys/dev/iscsi_initiator sys/modules sys/modules/iscsi/initiator sys/modules/iscsi_initiator

Thu Aug 22 14:02:38 UTC 2013

Author: trasz
Date: Thu Aug 22 14:02:34 2013
New Revision: 254657
URL: http://svnweb.freebsd.org/changeset/base/254657

Log:
  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.

Added:
  head/sys/dev/iscsi_initiator/
     - copied from r254596, head/sys/dev/iscsi/initiator/
  head/sys/modules/iscsi_initiator/
     - copied from r254596, head/sys/modules/iscsi/initiator/
Deleted:
  head/sys/dev/iscsi/initiator/
  head/sys/modules/iscsi/initiator/
Modified:
  head/sbin/iscontrol/auth_subr.c
  head/sbin/iscontrol/config.c
  head/sbin/iscontrol/fsm.c
  head/sbin/iscontrol/iscontrol.c
  head/sbin/iscontrol/login.c
  head/sbin/iscontrol/misc.c
  head/sbin/iscontrol/pdu.c
  head/sys/conf/files
  head/sys/dev/iscsi_initiator/isc_cam.c
  head/sys/dev/iscsi_initiator/isc_sm.c
  head/sys/dev/iscsi_initiator/isc_soc.c
  head/sys/dev/iscsi_initiator/isc_subr.c
  head/sys/dev/iscsi_initiator/iscsi.c
  head/sys/dev/iscsi_initiator/iscsi_subr.c
  head/sys/modules/Makefile
  head/sys/modules/iscsi_initiator/Makefile

Modified: head/sbin/iscontrol/auth_subr.c
==============================================================================

--- head/sbin/iscontrol/auth_subr.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/auth_subr.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <md5.h>
 #include <sha.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static int

Modified: head/sbin/iscontrol/config.c
==============================================================================
--- head/sbin/iscontrol/config.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/config.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 /*

Modified: head/sbin/iscontrol/fsm.c
==============================================================================
--- head/sbin/iscontrol/fsm.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/fsm.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 typedef enum {

Modified: head/sbin/iscontrol/iscontrol.c
==============================================================================
--- head/sbin/iscontrol/iscontrol.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/iscontrol.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static char version[] = "2.3.1"; // keep in sync with iscsi_initiator

Modified: head/sbin/iscontrol/login.c
==============================================================================
--- head/sbin/iscontrol/login.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/login.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static char *status_class1[] = {

Modified: head/sbin/iscontrol/misc.c
==============================================================================
--- head/sbin/iscontrol/misc.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/misc.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <string.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static inline char

Modified: head/sbin/iscontrol/pdu.c
==============================================================================
--- head/sbin/iscontrol/pdu.c	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sbin/iscontrol/pdu.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static void	pukeText(char *it, pdu_t *pp);

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sys/conf/files	Thu Aug 22 14:02:34 2013	(r254657)
@@ -1521,12 +1521,12 @@ ipw_monitor.fw			optional ipwmonitorfw |
 	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

Modified: head/sys/dev/iscsi_initiator/isc_cam.c
==============================================================================
--- head/sys/dev/iscsi/initiator/isc_cam.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/isc_cam.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_periph.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static void
 _inq(struct cam_sim *sim, union ccb *ccb)

Modified: head/sys/dev/iscsi_initiator/isc_sm.c
==============================================================================
--- head/sys/dev/iscsi/initiator/isc_sm.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/isc_sm.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_periph.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static void
 _async(isc_session_t *sp, pduq_t *pq)

Modified: head/sys/dev/iscsi_initiator/isc_soc.c
==============================================================================
--- head/sys/dev/iscsi/initiator/isc_soc.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/isc_soc.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 #ifndef NO_USE_MBUF
 #define USE_MBUF

Modified: head/sys/dev/iscsi_initiator/isc_subr.c
==============================================================================
--- head/sys/dev/iscsi/initiator/isc_subr.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/isc_subr.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/libkern.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options");
 

Modified: head/sys/dev/iscsi_initiator/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/initiator/iscsi.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/iscsi.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 #include <sys/sx.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 static char *iscsi_driver_version = "2.3.1";
 
 static struct isc_softc *isc;

Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c
==============================================================================
--- head/sys/dev/iscsi/initiator/iscsi_subr.c	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/dev/iscsi_initiator/iscsi_subr.c	Thu Aug 22 14:02:34 2013	(r254657)
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_message.h>
 #include <sys/eventhandler.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 /*
  | Interface to the SCSI layer

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Thu Aug 22 13:24:40 2013	(r254656)
+++ head/sys/modules/Makefile	Thu Aug 22 14:02:34 2013	(r254657)
@@ -159,7 +159,7 @@ SUBDIR=	\
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
-	iscsi \
+	iscsi_initiator \
 	isp \
 	${_ispfw} \
 	${_iwi} \

Modified: head/sys/modules/iscsi_initiator/Makefile
==============================================================================
--- head/sys/modules/iscsi/initiator/Makefile	Wed Aug 21 08:01:52 2013	(r254596)
+++ head/sys/modules/iscsi_initiator/Makefile	Thu Aug 22 14:02:34 2013	(r254657)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../dev/iscsi/initiator
+.PATH: ${.CURDIR}/../../dev/iscsi_initiator
 KMOD=iscsi_initiator
 
 SRCS=  iscsi.h iscsivar.h
