Date: Thu, 8 Sep 2005 07:45:59 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 83252 for review Message-ID: <200509080745.j887jxsj009937@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=83252 Change 83252 by scottl@scottl-junior on 2005/09/08 07:45:49 Adjust include paths and fix some minor compile warnings. Affected files ... .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#2 edit .. //depot/projects/iscsi/src/sys/modules/iscsi_initiator/Makefile#2 edit Differences ... ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#2 (text+ko) ==== @@ -42,8 +42,8 @@ #include <sys/malloc.h> #include <sys/mbuf.h> -#include "iscsi.h" -#include "iscsivar.h" +#include <dev/iscsi/iscsi.h> +#include <dev/iscsi/iscsivar.h> // XXX: untested/incomplete void ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#2 (text+ko) ==== @@ -56,8 +56,8 @@ #include <unistd.h> -#include "iscsi.h" -#include "iscsivar.h" +#include <dev/iscsi/iscsi.h> +#include <dev/iscsi/iscsivar.h> static void _async(isc_session_t *sp, pduq_t *pq) @@ -260,7 +260,7 @@ #if __FreeBSD_version < 600000 xdebug("%d] pdu len=%d > %d", #else - xdebug("%d] pdu len=%ld > %d", + xdebug("%d] pdu len=%zd > %d", #endif sp->sid, len, sp->opt.maxXmitDataSegmentLength); return E2BIG; ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#2 (text+ko) ==== @@ -50,8 +50,8 @@ #include <sys/user.h> #include <unistd.h> -#include "iscsi.h" -#include "iscsivar.h" +#include <dev/iscsi/iscsi.h> +#include <dev/iscsi/iscsivar.h> /* | wait till a PDU header is received | from the socket. @@ -81,7 +81,7 @@ #if __FreeBSD_version < 600000 debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%d", #else - debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%ld", + debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%zd", #endif so->so_error, uio.uio_resid, iov.iov_len); error = EPIPE; ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#2 (text+ko) ==== @@ -48,8 +48,8 @@ #include <sys/syslog.h> #include <sys/mbuf.h> -#include "iscsi.h" -#include "iscsivar.h" +#include <dev/iscsi/iscsi.h> +#include <dev/iscsi/iscsivar.h> MALLOC_DEFINE(M_PDU, "iSCSI pdu", "iSCSI driver"); ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#2 (text+ko) ==== @@ -49,13 +49,9 @@ #include <sys/mbuf.h> #include <sys/sysctl.h> #include <sys/syslog.h> -#if 0 + #include <dev/iscsi/iscsi.h> #include <dev/iscsi/iscsivar.h> -#else -#include "iscsi.h" -#include "iscsivar.h" -#endif struct isc isc; ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#2 (text+ko) ==== @@ -43,8 +43,8 @@ #include <cam/cam_periph.h> #include <cam/scsi/scsi_message.h> -#include "iscsi.h" -#include "iscsivar.h" +#include <dev/iscsi/iscsi.h> +#include <dev/iscsi/iscsivar.h> /* | Interface to the SCSI layer ==== //depot/projects/iscsi/src/sys/modules/iscsi_initiator/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -KMOD=iscsi +KMOD=iscsi_initiator + SRCS=iscsi.c isc_cam.c isc_soc.c isc_sm.c isc_subr.c iscsi_subr.c SRCS+=iscsi.h iscsivar.h -#SRCS+=device_if.h bus_if.h SRCS+=opt_cam.h .PATH: ${.CURDIR}/../../dev/iscsi @@ -9,5 +9,4 @@ # Debugging CFLAGS+= -DISCSI_DEBUG=9 - .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509080745.j887jxsj009937>