From caa8cdfedb2615957d0fa11130ea025906d1810d Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Thu, 7 Jun 2012 10:38:50 -0700 Subject: [PATCH] --- yaml --- r: 312659 b: refs/heads/master c: 7acd57070649da4ac3923f1d2075c084d83da1f4 h: refs/heads/master i: 312657: 2f145f55f8b08dc6e66db7d1c0d9084b2995b4e3 312655: fa4aa1800b9d9f81121841d584522cbf97ccb3ef v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_configfs.c | 38 --------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/[refs] b/[refs] index 0ef92180d99f..0a6c0c5c0ac1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f3eb93eaf5bd49051458fcb098af3fcf111d3d0 +refs/heads/master: 7acd57070649da4ac3923f1d2075c084d83da1f4 diff --git a/trunk/drivers/target/target_core_configfs.c b/trunk/drivers/target/target_core_configfs.c index 801efa892046..37c4bf3be43a 100644 --- a/trunk/drivers/target/target_core_configfs.c +++ b/trunk/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) {