From 1fb8175c51a89d58be36904f4bef496cebb89271 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Mon, 26 Nov 2007 16:23:50 +0000
Subject: [PATCH]  - Fixes build problem in perf mode  - Switches between debug
 modes made as Makefile targets, thanks Tomasz Chmielewski <mangoo@wpkg.org>
 for idea

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@225 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile                      | 36 ++++++++++++++++++++++++++++++++++-
 debug2perf                    |  8 --------
 debug2release                 |  8 --------
 iscsi-scst/README             |  2 ++
 iscsi-scst/kernel/iscsi_dbg.h |  1 +
 perf2debug                    |  8 --------
 release2debug                 |  8 --------
 scst/README                   |  4 ++--
 8 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100755 debug2perf
 delete mode 100755 debug2release
 delete mode 100755 perf2debug
 delete mode 100755 release2debug

diff --git a/Makefile b/Makefile
index 79aee18a2..df7af023b 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,11 @@ help:
 	@echo "		usr_install       : usr target: install"
 	@echo "		usr_uninstall     : usr target: uninstall"
 	@echo ""
+	@echo "		debug2perf        : changes debug state from full debug to full performance"
+	@echo "		debug2release     : changes debug state from full debug to release"
+	@echo "		perf2debug        : changes debug state from full performance to full debug"
+	@echo "		release2debug     : changes debug state from release to full debug"
+	@echo ""
 	@echo "	Note:"
 	@echo "		- install and uninstall may need root privileges"
 
@@ -181,9 +186,38 @@ usr_clean:
 usr_extraclean:
 	cd $(USR_DIR) && $(MAKE) extraclean
 
+debug2perf:
+	echo "Changing current debug state from full debug to full performance"
+	patch -p0 <scst-full_perf.patch
+	patch -p0 <usr-full_perf.patch
+	patch -p0 <qla2x00t-full_perf.patch
+	patch -p0 <iscsi-full_perf.patch
+
+debug2release:
+	echo "Changing current debug state from full debug to release"
+	patch -p0 <scst-release.patch
+	patch -p0 <usr-release.patch
+	patch -p0 <qla2x00t-release.patch
+	patch -p0 <iscsi-release.patch
+
+perf2debug:
+	echo "Changing current debug state from full performance to full debug"
+	patch -p0 -R <scst-full_perf.patch
+	patch -p0 -R <usr-full_perf.patch
+	patch -p0 -R <qla2x00t-full_perf.patch
+	patch -p0 -R <iscsi-full_perf.patch
+
+release2debug:
+	echo "Changing current debug state from release to full debug"
+	patch -p0 -R <scst-release.patch
+	patch -p0 -R <usr-release.patch
+	patch -p0 -R <qla2x00t-release.patch
+	patch -p0 -R <iscsi-release.patch
+
 .PHONY: all install uninstall clean extraclean help \
 	qla qla_install qla_uninstall qla_clean qla_extraclean \
 	lsi lsi_install lsi_uninstall lsi_clean lsi_extraclean \
 	iscsi iscsi_install iscsi_uninstall iscsi_clean iscsi_extraclean \
 	scst scst_install scst_uninstall scst_clean scst_extraclean \
-	usr usr_install usr_uninstall usr_clean usr_extraclean
+	usr usr_install usr_uninstall usr_clean usr_extraclean \
+	debug2perf, debug2release, perf2debug, release2debug
diff --git a/debug2perf b/debug2perf
deleted file mode 100755
index 2a64a9f66..000000000
--- a/debug2perf
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Changing current debug state from full debug to full performance"
-
-patch -p0 <scst-full_perf.patch && \
-patch -p0 <usr-full_perf.patch && \
-patch -p0 <qla2x00t-full_perf.patch && \
-patch -p0 <iscsi-full_perf.patch
diff --git a/debug2release b/debug2release
deleted file mode 100755
index 1a6e80d7d..000000000
--- a/debug2release
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Changing current debug state from full debug to release"
-
-patch -p0 <scst-release.patch && \
-patch -p0 <usr-release.patch && \
-patch -p0 <qla2x00t-release.patch && \
-patch -p0 <iscsi-release.patch
diff --git a/iscsi-scst/README b/iscsi-scst/README
index 65ff5b272..0a5d968b8 100644
--- a/iscsi-scst/README
+++ b/iscsi-scst/README
@@ -153,5 +153,7 @@ Thanks to:
 
  * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> for comments and help in
    debugging
+
+ * Tomasz Chmielewski <mangoo@wpkg.org> for testing and suggestions
  
 Vladislav Bolkhovitin <vst@vlnb.net>, http://scst.sourceforge.net
diff --git a/iscsi-scst/kernel/iscsi_dbg.h b/iscsi-scst/kernel/iscsi_dbg.h
index 1f20d00df..4df5e89c3 100644
--- a/iscsi-scst/kernel/iscsi_dbg.h
+++ b/iscsi-scst/kernel/iscsi_dbg.h
@@ -99,6 +99,7 @@ do {                                                                \
 
 #else /* defined(DEBUG) || defined(TRACING) */
 #define TRACE_CONN_CLOSE(format, args...) {}
+#define TRACE_CONN_CLOSE_DBG(format, args...) {}
 #define TRACE_NET_PAGE(format, args...) {}
 #endif
 
diff --git a/perf2debug b/perf2debug
deleted file mode 100755
index f672da282..000000000
--- a/perf2debug
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Changing current debug state from full performance to full debug"
-
-patch -p0 -R <scst-full_perf.patch && \
-patch -p0 -R <usr-full_perf.patch && \
-patch -p0 -R <qla2x00t-full_perf.patch && \
-patch -p0 -R <iscsi-full_perf.patch
diff --git a/release2debug b/release2debug
deleted file mode 100755
index 72377c128..000000000
--- a/release2debug
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Changing current debug state from release to full debug"
-
-patch -p0 -R <scst-release.patch && \
-patch -p0 -R <usr-release.patch && \
-patch -p0 -R <qla2x00t-release.patch && \
-patch -p0 -R <iscsi-release.patch
diff --git a/scst/README b/scst/README
index e9c7ecf87..4dbd41adf 100644
--- a/scst/README
+++ b/scst/README
@@ -594,9 +594,9 @@ IMPORTANT: Some of the compilation options enabled by default, i.e. SCST
 =========  is optimized currently rather for development and bug hunting,
            than for performance.
 
-If you use SCST version taken directly from its SVN repository, you can
+If you use SCST version taken directly from the SVN repository, you can
 set the above options, except ALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ, using
-debug2perf script file.
+debug2perf Makefile target.
 
 4. For kernel: