From 299b079f7cdb1cda776b6276a8c8fe9406436614 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 8 Jul 2008 19:21:22 +0000
Subject: [PATCH] Pending changes to match the 1.0.0 released packeges

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@436 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile                         |  2 ++
 iscsi-scst/Makefile              |  8 +++++--
 iscsi-scst/README                |  2 ++
 iscsi-scst/kernel/Makefile       |  3 ---
 qla2x00t/qla2x00-target/Makefile |  8 +++----
 scst/src/scst_main.c             |  5 ++++-
 scstadmin/Changes                | 38 ++++++++++++++++----------------
 usr/fileio/Makefile              |  3 ++-
 usr/fileio/README                | 16 +++++++-------
 9 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index e322a681f..9f6f04a48 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,7 @@ debug2perf:
 	patch -p0 <usr-full_perf.patch
 	patch -p0 <qla2x00t-full_perf.patch
 	patch -p0 <iscsi-full_perf.patch
+	patch -p0 <qla_isp-release.patch
 
 debug2release:
 	echo "Changing current debug state from full debug to release"
@@ -272,6 +273,7 @@ perf2debug:
 	patch -p0 -R <usr-full_perf.patch
 	patch -p0 -R <qla2x00t-full_perf.patch
 	patch -p0 -R <iscsi-full_perf.patch
+	patch -p0 -R <qla_isp-release.patch
 
 release2debug:
 	echo "Changing current debug state from release to full debug"
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index c406b2f99..371f65bb7 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -5,7 +5,11 @@
 # removes any old dependencies. DON'T put your own dependencies here
 # unless it's something special (not a .c file).
 
-SCST_DIR := $(shell pwd)/../scst/src
+SCST_INC_DIR := /usr/local/include/scst
+#SCST_INC_DIR := $(SUBDIRS)/../../scst/include
+SCST_DIR := $(SCST_INC_DIR)
+#SCST_DIR := $(shell pwd)/../scst/src
+
 SUBDIRS := $(shell pwd)
 
 ifeq ($(KVER),)
@@ -22,7 +26,7 @@ endif
 all: include/iscsi_scst_itf_ver.h progs mods
 
 mods: Modules.symvers Module.symvers
-	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/kernel modules
+	$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(shell pwd)/kernel modules
 
 progs:
 	$(MAKE) -C usr
diff --git a/iscsi-scst/README b/iscsi-scst/README
index f4dce2441..6d06176a9 100644
--- a/iscsi-scst/README
+++ b/iscsi-scst/README
@@ -109,6 +109,8 @@ or
 Usage
 -----
 
+See in doc/iscsi-scst-howto.txt examples how to configure iSCSI-SCST.
+
 ISCSI parameters like iSNS, CHAP and target parameters are configured in
 iscsi-scstd.conf. All LUN information is configured using the regular
 SCST interface. It is highly recommended to use scstadmin utility for
diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile
index 34f03e688..76c11e865 100644
--- a/iscsi-scst/kernel/Makefile
+++ b/iscsi-scst/kernel/Makefile
@@ -20,9 +20,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
-#SCST_INC_DIR := /usr/local/include/scst
-SCST_INC_DIR := $(SUBDIRS)/../../scst/include
-
 EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR)
 # -Wextra -Wno-unused-parameter
 
diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index e97edf4f3..26240e133 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -26,10 +26,10 @@
 #    - install and uninstall must be made as root
 #
 
-#SCST_INC_DIR := /usr/local/include/scst
-#SCST_DIR := $(SCST_INC_DIR)
-SCST_INC_DIR := $(SUBDIRS)/../../scst/include
-SCST_DIR := $(shell pwd)/../../scst/src
+SCST_INC_DIR := /usr/local/include/scst
+SCST_DIR := $(SCST_INC_DIR)
+#SCST_INC_DIR := $(SUBDIRS)/../../scst/include
+#SCST_DIR := $(shell pwd)/../../scst/src
 
 EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_TARGET_SUPPORT
 
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index f231258b8..9674dbdb2 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -469,6 +469,7 @@ static int scst_susp_wait(bool interruptible)
 int scst_suspend_activity(bool interruptible)
 {
 	int res = 0;
+	bool rep = false;
 
 	TRACE_ENTRY();
 
@@ -508,6 +509,7 @@ int scst_suspend_activity(bool interruptible)
 			"forever until the corresponding user space "
 			"program recovers and starts responding or gets "
 			"killed.", atomic_read(&scst_cmd_count));
+		rep = true;
 	}
 
 	res = scst_susp_wait(interruptible);
@@ -524,7 +526,8 @@ int scst_suspend_activity(bool interruptible)
 	if (res != 0)
 		goto out_clear;
 
-	PRINT_INFO("%s", "All active commands completed");
+	if (rep)
+		PRINT_INFO("%s", "All active commands completed");
 
 out_up:
 	mutex_unlock(&scst_suspend_mutex);
diff --git a/scstadmin/Changes b/scstadmin/Changes
index bd51202bd..1781b932f 100644
--- a/scstadmin/Changes
+++ b/scstadmin/Changes
@@ -1,20 +1,7 @@
-Changes since 0.9.2-pre2:
+Changes since 1.0.0 RC1
 
-- List SCST sessions
-- Verify specified config file against live configuration and show differences
-- Write config file based on live configuration
-- Force-apply configuration, even config deletions with a force flag.
-- Added new option types
-- Added support for specifying a blocksize
-- Added "-reload-config" to init script
-
-Changes since 0.9.5-pre0:
-
-- Renamed scst to scstadmin
-- Fixed writeConfiguration() to properly write DEVICE lines with no options
-- Removed the comment which prevented a target from being enabled in enableTarget()
-- Updated init.d/scst to use scstadmin instead of scst_db
-- Fixup of README file
+- Updated SCST/SCST.pm to add one more option mapping NV -> NV_CACHE.
+- Install/uninstall added.
 
 Changes since 0.9.6-pre2:
 
@@ -34,7 +21,20 @@ Changes since 0.9.6-pre2:
 - Fixed handling of disabled handlers (like dev_disk, dev_cdrom, etc from compile time)
 - Minor bug fixes
 
-Changes since 1.0.0 RC1
+Changes since 0.9.5-pre0:
 
-- Updated SCST/SCST.pm to add one more option mapping NV -> NV_CACHE.
-- Install/uninstall added.
+- Renamed scst to scstadmin
+- Fixed writeConfiguration() to properly write DEVICE lines with no options
+- Removed the comment which prevented a target from being enabled in enableTarget()
+- Updated init.d/scst to use scstadmin instead of scst_db
+- Fixup of README file
+
+Changes since 0.9.2-pre2:
+
+- List SCST sessions
+- Verify specified config file against live configuration and show differences
+- Write config file based on live configuration
+- Force-apply configuration, even config deletions with a force flag.
+- Added new option types
+- Added support for specifying a blocksize
+- Added "-reload-config" to init script
diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile
index 3c9eb65ef..1bdb67813 100644
--- a/usr/fileio/Makefile
+++ b/usr/fileio/Makefile
@@ -20,7 +20,8 @@ OBJS_F = $(SRCS_F:.c=.o)
 #SRCS_C = 
 #OBJS_C = $(SRCS_C:.c=.o)
 
-SCST_INC_DIR := ../../scst/include
+#SCST_INC_DIR := ../../scst/include
+SCST_INC_DIR := /usr/local/include/scst
 INSTALL_DIR := /usr/local/bin/scst
 
 CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \
diff --git a/usr/fileio/README b/usr/fileio/README
index 2c7b9197d..d4b7513c7 100644
--- a/usr/fileio/README
+++ b/usr/fileio/README
@@ -5,14 +5,14 @@ Version 1.0.0, 7 July 2008
 --------------------------
 
 User space program fileio_tgt uses interface of SCST's scst_user dev
-handler as well as allows to see how it works in various modes.
-Fileio_tgt provides mostly the same functionality as the kernel space
-SCST's scst_vdisk handler with the only exceptions that it supports
-O_DIRECT mode and doesn't support BLOCKIO one. O_DIRECT mode is
-basically the same as BLOCKIO, but also supports files, so for some
-loads it could be significantly faster, than the regular FILEIO access.
-All the words about BLOCKIO mode from SCST's README file apply to
-O_DIRECT mode as well.
+handler and allows to see how it works in various modes. Fileio_tgt
+provides mostly the same functionality as the kernel space SCST's
+scst_vdisk handler with the only exceptions that it supports O_DIRECT
+mode and doesn't support BLOCKIO one. O_DIRECT mode is basically the
+same as BLOCKIO, but also supports files, so for some loads it could be
+significantly faster, than the regular FILEIO access. All the words
+about BLOCKIO mode from SCST's README file apply to O_DIRECT mode as
+well.
 
 Installation
 ------------