[Scst-svn] SF.net SVN: scst: [417] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 417
          http://scst.svn.sourceforge.net/scst/?rev=417&view=rev
Author:   vlnb
Date:     2008-06-19 10:48:08 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
 - Fixes not cleanly applies xxx2yyy patches
 - Updated to IET r155
 - Compilation fixes
 - Typos fixes, including patch from Dotan Barak <do...@gm...>

Modified Paths:
--------------
    trunk/iscsi-scst/include/iscsi_scst_ver.h
    trunk/scst/README
    trunk/scst/include/scst.h
    trunk/scst/src/dev_handlers/scst_vdisk.c
    trunk/scst/src/scst_proc.c
    trunk/scst-full_perf.patch
    trunk/scst-release.patch
    trunk/usr-full_perf.patch
    trunk/usr-release.patch

Modified: trunk/iscsi-scst/include/iscsi_scst_ver.h
===================================================================

--- trunk/iscsi-scst/include/iscsi_scst_ver.h	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/iscsi-scst/include/iscsi_scst_ver.h	2008-06-19 17:48:08 UTC (rev 417)
@@ -13,4 +13,4 @@
  *  GNU General Public License for more details.
  */
 
-#define ISCSI_VERSION_STRING	"1.0.0/0.4.16r151"
+#define ISCSI_VERSION_STRING	"1.0.0/0.4.16r155"

Modified: trunk/scst/README
===================================================================
--- trunk/scst/README	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst/README	2008-06-19 17:48:08 UTC (rev 417)
@@ -491,7 +491,7 @@
 	 Moreover, if you want to compare how well different block sizes
 	 work for you, you **MUST** EVERY TIME AFTER CHANGING BLOCK SIZE
 	 **COMPLETELY** **WIPE OFF** ALL THE DATA FROM THE DEVICE. In
-	 other words, THE **WHOLE** DEVICE **MUST** HAVE ONLY **ZEROES**
+	 other words, THE **WHOLE** DEVICE **MUST** HAVE ONLY **ZEROS**
 	 AS THE DATA AFTER YOU SWITCH TO NEW BLOCK SIZE. Switching block
 	 sizes isn't like switching between FILEIO and BLOCKIO, after
 	 changing block size all previously written with another block

Modified: trunk/scst/include/scst.h
===================================================================
--- trunk/scst/include/scst.h	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst/include/scst.h	2008-06-19 17:48:08 UTC (rev 417)
@@ -1309,7 +1309,7 @@
 	 * How much memory allowed to allocated under this object. Put here
 	 * mostly to save a possible cache miss accessing scst_max_dev_cmd_mem.
 	 */
-	unsigned int max_allowed_pages;
+	int max_allowed_pages;
 };
 
 struct scst_device {

Modified: trunk/scst/src/dev_handlers/scst_vdisk.c
===================================================================
--- trunk/scst/src/dev_handlers/scst_vdisk.c	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst/src/dev_handlers/scst_vdisk.c	2008-06-19 17:48:08 UTC (rev 417)
@@ -21,7 +21,6 @@
  *  GNU General Public License for more details.
  */
 
-#include <linux/uaccess.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/string.h>

Modified: trunk/scst/src/scst_proc.c
===================================================================
--- trunk/scst/src/scst_proc.c	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst/src/scst_proc.c	2008-06-19 17:48:08 UTC (rev 417)
@@ -27,7 +27,6 @@
 #include <linux/sched.h>
 #include <linux/unistd.h>
 #include <linux/string.h>
-#include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
@@ -242,9 +241,9 @@
 
 	/*
 	 * Usage:
-	 *   echo "all|none|default" >/proc/scsi_tgt/trace_log_level
-	 *   echo "value DEC|0xHEX|0OCT" >/proc/scsi_tgt/trace_log_level
-	 *   echo "set|add|clear|del TOKEN" >/proc/scsi_tgt/trace_log_level
+	 *   echo "all|none|default" >/proc/scsi_tgt/trace_level
+	 *   echo "value DEC|0xHEX|0OCT" >/proc/scsi_tgt/trace_level
+	 *   echo "set|add|clear|del TOKEN" >/proc/scsi_tgt/trace_level
 	 * where TOKEN is one of [debug,function,line,pid,entryexit,
 	 *                        buff,mem,sg,out_of_mem,retry,
 	 *                        scsi_serializing,special,scsi,mgmt,minor,...]

Modified: trunk/scst-full_perf.patch
===================================================================
--- trunk/scst-full_perf.patch	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst-full_perf.patch	2008-06-19 17:48:08 UTC (rev 417)
@@ -2,7 +2,7 @@
 ===================================================================
 --- scst/src/Makefile	(revision 233)
 +++ scst/src/Makefile	(working copy)
-@@ -114,7 +114,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
+@@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
  
  #EXTRA_CFLAGS += -DSTRICT_SERIALIZING
  
@@ -11,7 +11,7 @@
  
  #EXTRA_CFLAGS += -DUSE_EXPECTED_VALUES
  #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
-@@ -124,7 +124,7 @@ EXTRA_CFLAGS += -DEXTRACHECKS
+@@ -125,7 +125,7 @@ EXTRA_CFLAGS += -DEXTRACHECKS
  
  #EXTRA_CFLAGS += -DTRACING
  
@@ -24,7 +24,7 @@
 ===================================================================
 --- scst/src/dev_handlers/Makefile	(revision 230)
 +++ scst/src/dev_handlers/Makefile	(working copy)
-@@ -68,10 +68,10 @@ endif
+@@ -69,10 +69,10 @@ endif
  
  EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter
  
@@ -36,4 +36,4 @@
 +#EXTRA_CFLAGS += -DDEBUG -g
  
  clean:
- 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers Module.symvers
+ 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \

Modified: trunk/scst-release.patch
===================================================================
--- trunk/scst-release.patch	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/scst-release.patch	2008-06-19 17:48:08 UTC (rev 417)
@@ -2,7 +2,7 @@
 ===================================================================
 --- scst/src/Makefile	(revision 233)
 +++ scst/src/Makefile	(working copy)
-@@ -114,7 +114,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
+@@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
  
  #EXTRA_CFLAGS += -DSTRICT_SERIALIZING
  
@@ -11,7 +11,7 @@
  
  #EXTRA_CFLAGS += -DUSE_EXPECTED_VALUES
  #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
-@@ -122,9 +122,9 @@ EXTRA_CFLAGS += -DEXTRACHECKS
+@@ -123,9 +123,9 @@ EXTRA_CFLAGS += -DEXTRACHECKS
  
  #EXTRA_CFLAGS += -fno-inline
  
@@ -27,7 +27,7 @@
 ===================================================================
 --- scst/src/dev_handlers/Makefile	(revision 230)
 +++ scst/src/dev_handlers/Makefile	(working copy)
-@@ -68,10 +68,10 @@ endif
+@@ -69,10 +69,10 @@ endif
  
  EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter
  
@@ -40,4 +40,4 @@
 +#EXTRA_CFLAGS += -DDEBUG -g
  
  clean:
- 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers Module.symvers
+ 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \

Modified: trunk/usr-full_perf.patch
===================================================================
--- trunk/usr-full_perf.patch	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/usr-full_perf.patch	2008-06-19 17:48:08 UTC (rev 417)
@@ -2,7 +2,7 @@
 ===================================================================
 --- usr/fileio/Makefile	(revision 324)
 +++ usr/fileio/Makefile	(working copy)
-@@ -28,9 +28,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-
+@@ -29,9 +29,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-
  PROGS = fileio_tgt
  LIBS = -lpthread
  

Modified: trunk/usr-release.patch
===================================================================
--- trunk/usr-release.patch	2008-06-18 09:54:38 UTC (rev 416)
+++ trunk/usr-release.patch	2008-06-19 17:48:08 UTC (rev 417)
@@ -2,7 +2,7 @@
 ===================================================================
 --- usr/fileio/Makefile	(revision 324)
 +++ usr/fileio/Makefile	(working copy)
-@@ -28,9 +28,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-
+@@ -29,9 +29,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-
  PROGS = fileio_tgt
  LIBS = -lpthread
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


