summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Grover <agrover@redhat.com>2012-06-07 10:38:50 -0700
committerNicholas Bellinger <nab@linux-iscsi.org>2012-06-12 21:38:44 -0700
commitfd88a785f9ac5d6be437c528571ccd85cdf2d493 (patch)
tree9c906bd91bd98d813e12b8c3aa6e27e8a6933024
parent188849123133d1a67b0af6a754a1a3c19e390479 (diff)
downloadlinux-fd88a785f9ac5d6be437c528571ccd85cdf2d493.tar.gz
linux-fd88a785f9ac5d6be437c528571ccd85cdf2d493.tar.xz
linux-fd88a785f9ac5d6be437c528571ccd85cdf2d493.zip
target: Do not special-case loop and iscsi fabric module loads
These modules, along with other fabrics, should be loaded as-needed by the LIO userspace tools. Signed-off-by: Andy Grover <agrover@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/target_core_configfs.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 801efa892046..37c4bf3be43a 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -122,47 +122,9 @@ static struct config_group *target_core_register_fabric(
const char *name)
{
struct target_fabric_configfs *tf;
- int ret;
pr_debug("Target_Core_ConfigFS: REGISTER -> group: %p name:"
" %s\n", group, name);
- /*
- * Below are some hardcoded request_module() calls to automatically
- * local fabric modules when the following is called:
- *
- * mkdir -p /sys/kernel/config/target/$MODULE_NAME
- *
- * Note that this does not limit which TCM fabric module can be
- * registered, but simply provids auto loading logic for modules with
- * mkdir(2) system calls with known TCM fabric modules.
- */
- if (!strncmp(name, "iscsi", 5)) {
- /*
- * Automatically load the LIO Target fabric module when the
- * following is called:
- *
- * mkdir -p $CONFIGFS/target/iscsi
- */
- ret = request_module("iscsi_target_mod");
- if (ret < 0) {
- pr_err("request_module() failed for"
- " iscsi_target_mod.ko: %d\n", ret);
- return ERR_PTR(-EINVAL);
- }
- } else if (!strncmp(name, "loopback", 8)) {
- /*
- * Automatically load the tcm_loop fabric module when the
- * following is called:
- *
- * mkdir -p $CONFIGFS/target/loopback
- */
- ret = request_module("tcm_loop");
- if (ret < 0) {
- pr_err("request_module() failed for"
- " tcm_loop.ko: %d\n", ret);
- return ERR_PTR(-EINVAL);
- }
- }
tf = target_core_get_fabric(name);
if (!tf) {