target: Put TCMU under a new config option

Conceptually version 2 should be viewed as an entirely new, incompatible
version of TCMU, so emphasize this by changing the config option and
Kconfig text.

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/Kconfig b/drivers/target/Kconfig
index 81d44c477a5bf11431e37659adf62acf94a8b5bf..257361280510b5b69532ec890941a9fde79e45d6 100644 (file)
--- a/drivers/target/Kconfig
+++ b/drivers/target/Kconfig
@@ -31,12 +31,13 @@ config TCM_PSCSI
        Say Y here to enable the TCM/pSCSI subsystem plugin for non-buffered
        passthrough access to Linux/SCSI device
 
-config TCM_USER
+config TCM_USER2
        tristate "TCM/USER Subsystem Plugin for Linux"
        depends on UIO && NET
        help
        Say Y here to enable the TCM/USER subsystem plugin for a userspace
-       process to handle requests
+       process to handle requests. This is version 2 of the ABI; version 1
+       is obsolete.
 
 source "drivers/target/loopback/Kconfig"
 source "drivers/target/tcm_fc/Kconfig"

diff --git a/drivers/target/Makefile b/drivers/target/Makefile
index bbb4a7d638efeb4309120b4275cd0415befd9a05..e619c0266a7939bdae8f52ff1da8390e90de6b6b 100644 (file)
--- a/drivers/target/Makefile
+++ b/drivers/target/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_TARGET_CORE)     += target_core_mod.o
 obj-$(CONFIG_TCM_IBLOCK)       += target_core_iblock.o
 obj-$(CONFIG_TCM_FILEIO)       += target_core_file.o
 obj-$(CONFIG_TCM_PSCSI)                += target_core_pscsi.o
-obj-$(CONFIG_TCM_USER)         += target_core_user.o
+obj-$(CONFIG_TCM_USER2)                += target_core_user.o
 
 # Fabric modules
 obj-$(CONFIG_LOOPBACK_TARGET)  += loopback/