From a31a60aebf1ec8793fa1793dd3dabcafd6260dbb Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Mon, 17 Jan 2011 12:44:34 +0000
Subject: [PATCH] Minor versions handling improvements

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3227 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/scst.h       | 14 --------------
 scst/include/scst_const.h | 16 ++++++++++++++++
 scst/include/scst_user.h  |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/scst/include/scst.h b/scst/include/scst.h
index 924331421..8663da631 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -140,20 +140,6 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
 }
 #endif
 
-/*
- * Version numbers, the same as for the kernel.
- *
- * Changing it don't forget to change SCST_FIO_REV in scst_vdisk.c
- * and FIO_REV in usr/fileio/common.h as well.
- */
-#define SCST_VERSION(a, b, c, d)    (((a) << 24) + ((b) << 16) + ((c) << 8) + d)
-#define SCST_VERSION_CODE	    SCST_VERSION(2, 0, 0, 0)
-#ifdef CONFIG_SCST_PROC
-#define SCST_VERSION_STRING_SUFFIX  "-procfs"
-#else
-#define SCST_VERSION_STRING_SUFFIX
-#endif
-#define SCST_VERSION_STRING	    "2.1.0-pre1" SCST_VERSION_STRING_SUFFIX
 #define SCST_INTERFACE_VERSION	    \
 		SCST_VERSION_STRING "$Revision$" SCST_CONST_VERSION
 
diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index 4a2a77f86..eeaaf3023 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -31,6 +31,22 @@
 #endif
 #include <scsi/scsi.h>
 
+/*
+ * Version numbers, the same as for the kernel.
+ *
+ * Changing it don't forget to change SCST_FIO_REV in scst_vdisk.c
+ * and FIO_REV in usr/fileio/common.h as well.
+ */
+#define SCST_VERSION(a, b, c, d)    (((a) << 24) + ((b) << 16) + ((c) << 8) + d)
+#define SCST_VERSION_CODE	    SCST_VERSION(2, 1, 0, 0)
+#ifdef CONFIG_SCST_PROC
+#define SCST_VERSION_STRING_SUFFIX  "-procfs"
+#else
+#define SCST_VERSION_STRING_SUFFIX
+#endif
+#define SCST_VERSION_NAME	    "2.1.0-pre1"
+#define SCST_VERSION_STRING	    SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX
+
 #define SCST_CONST_VERSION "$Revision$"
 
 /*** Shared constants between user and kernel spaces ***/
diff --git a/scst/include/scst_user.h b/scst/include/scst_user.h
index 8a1ece356..8b19075bf 100644
--- a/scst/include/scst_user.h
+++ b/scst/include/scst_user.h
@@ -31,7 +31,7 @@
 
 #define DEV_USER_NAME			"scst_user"
 #define DEV_USER_PATH			"/dev/"
-#define DEV_USER_VERSION_NAME		"2.1.0-pre1"
+#define DEV_USER_VERSION_NAME		SCST_VERSION_NAME
 #define DEV_USER_VERSION		\
 	DEV_USER_VERSION_NAME "$Revision$" SCST_CONST_VERSION