Menu
▾
▴
[Scst-svn] SF.net SVN: scst: [436] trunk
|
From: <vl...@us...> - 2008-07-08 19:21:23
|
Revision: 436
http://scst.svn.sourceforge.net/scst/?rev=436&view=rev
Author: vlnb
Date: 2008-07-08 12:21:22 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
Pending changes to match the 1.0.0 released packeges
Modified Paths:
--------------
trunk/Makefile
trunk/iscsi-scst/Makefile
trunk/iscsi-scst/README
trunk/iscsi-scst/kernel/Makefile
trunk/qla2x00t/qla2x00-target/Makefile
trunk/scst/src/scst_main.c
trunk/scstadmin/Changes
trunk/usr/fileio/Makefile
trunk/usr/fileio/README
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/Makefile 2008-07-08 19:21:22 UTC (rev 436)
@@ -257,6 +257,7 @@
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 @@
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"
Modified: trunk/iscsi-scst/Makefile
===================================================================
--- trunk/iscsi-scst/Makefile 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/iscsi-scst/Makefile 2008-07-08 19:21:22 UTC (rev 436)
@@ -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 @@
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
Modified: trunk/iscsi-scst/README
===================================================================
--- trunk/iscsi-scst/README 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/iscsi-scst/README 2008-07-08 19:21:22 UTC (rev 436)
@@ -109,6 +109,8 @@
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
Modified: trunk/iscsi-scst/kernel/Makefile
===================================================================
--- trunk/iscsi-scst/kernel/Makefile 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/iscsi-scst/kernel/Makefile 2008-07-08 19:21:22 UTC (rev 436)
@@ -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
Modified: trunk/qla2x00t/qla2x00-target/Makefile
===================================================================
--- trunk/qla2x00t/qla2x00-target/Makefile 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/qla2x00t/qla2x00-target/Makefile 2008-07-08 19:21:22 UTC (rev 436)
@@ -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
Modified: trunk/scst/src/scst_main.c
===================================================================
--- trunk/scst/src/scst_main.c 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/scst/src/scst_main.c 2008-07-08 19:21:22 UTC (rev 436)
@@ -469,6 +469,7 @@
int scst_suspend_activity(bool interruptible)
{
int res = 0;
+ bool rep = false;
TRACE_ENTRY();
@@ -508,6 +509,7 @@
"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 @@
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);
Modified: trunk/scstadmin/Changes
===================================================================
--- trunk/scstadmin/Changes 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/scstadmin/Changes 2008-07-08 19:21:22 UTC (rev 436)
@@ -1,21 +1,8 @@
-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
+- Updated SCST/SCST.pm to add one more option mapping NV -> NV_CACHE.
+- Install/uninstall added.
-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
-
Changes since 0.9.6-pre2:
- Updated SCST/SCST.pm for vdisk/vcdrom from cdrom_fileio/disk_fileio
@@ -34,7 +21,20 @@
- 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
Modified: trunk/usr/fileio/Makefile
===================================================================
--- trunk/usr/fileio/Makefile 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/usr/fileio/Makefile 2008-07-08 19:21:22 UTC (rev 436)
@@ -20,7 +20,8 @@
#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 \
Modified: trunk/usr/fileio/README
===================================================================
--- trunk/usr/fileio/README 2008-07-08 16:41:52 UTC (rev 435)
+++ trunk/usr/fileio/README 2008-07-08 19:21:22 UTC (rev 436)
@@ -5,14 +5,14 @@
--------------------------
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
------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
