- Fixes not cleanly applies xxx2yyy patches

- Updated to IET r155
 - Compilation fixes
 - Typos fixes, including patch from Dotan Barak <dotanba@gmail.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@417 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2008-06-19 17:48:08 +00:00
parent 5b6ba1d246
commit 5f2d7fddea
9 changed files with 16 additions and 18 deletions

View File

@@ -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"

View File

@@ -2,7 +2,7 @@ Index: scst/src/Makefile
===================================================================
--- 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 @@ Index: scst/src/Makefile
#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 @@ Index: scst/src/dev_handlers/Makefile
===================================================================
--- 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 @@ Index: scst/src/dev_handlers/Makefile
+#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 \

View File

@@ -2,7 +2,7 @@ Index: scst/src/Makefile
===================================================================
--- 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 @@ Index: scst/src/Makefile
#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 @@ Index: scst/src/dev_handlers/Makefile
===================================================================
--- 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 @@ Index: scst/src/dev_handlers/Makefile
+#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 \

View File

@@ -491,7 +491,7 @@ CAUTION: If you partitioned/formatted your device with block size X, *NEVER*
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

View File

@@ -1309,7 +1309,7 @@ struct scst_mem_lim {
* 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 {

View File

@@ -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>

View File

@@ -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 @@ int scst_proc_log_entry_write(struct file *file, const char *buf,
/*
* 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,...]

View File

@@ -2,7 +2,7 @@ Index: usr/fileio/Makefile
===================================================================
--- 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

View File

@@ -2,7 +2,7 @@ Index: usr/fileio/Makefile
===================================================================
--- 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