diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index e58995aec..2e464ef47 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -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" diff --git a/scst-full_perf.patch b/scst-full_perf.patch index cd8c6f71f..021408d09 100644 --- a/scst-full_perf.patch +++ b/scst-full_perf.patch @@ -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 \ diff --git a/scst-release.patch b/scst-release.patch index 595645a42..b897cfd93 100644 --- a/scst-release.patch +++ b/scst-release.patch @@ -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 \ diff --git a/scst/README b/scst/README index a2e38f807..e02c3fb1f 100644 --- a/scst/README +++ b/scst/README @@ -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 diff --git a/scst/include/scst.h b/scst/include/scst.h index 1eaeadd7e..e33388574 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -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 { diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 825296296..813fb18fb 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -21,7 +21,6 @@ * GNU General Public License for more details. */ -#include #include #include #include diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c index fabb98f27..7f373ae1f 100644 --- a/scst/src/scst_proc.c +++ b/scst/src/scst_proc.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -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,...] diff --git a/usr-full_perf.patch b/usr-full_perf.patch index 326860bda..36dffbd62 100644 --- a/usr-full_perf.patch +++ b/usr-full_perf.patch @@ -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 diff --git a/usr-release.patch b/usr-release.patch index 160e9167c..ef9c7c769 100644 --- a/usr-release.patch +++ b/usr-release.patch @@ -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