From fb4d3be6a95f9de1b4e69d9f5ccc5225b084aa7d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 29 Nov 2011 03:29:59 -0500 Subject: [PATCH] --- yaml --- r: 276479 b: refs/heads/master c: 6f21475576dde397cd2580262209d4080fbd5458 h: refs/heads/master i: 276477: e0246d5c9e09673f2867eab94afeb42102bb86a2 276475: f480b75bd7e216f7a59543c3471129180bf5dd05 276471: 38112c3327f9e8cf3a7d94b4ca9d3a750a397a83 276463: e94f5ba17c475250ce9e8c99f05d6b9b425f5096 276447: 2fb418808d2e1b36bf377dbce49a58c03e918f15 276415: 7d77c6e3e5f46ccb84eb0bea15318c5bcbd75c2b 276351: 95f01ca704fa6d750e105340195aa0fc79084027 276223: aae0794ecfaba2fa3cfbaef0a27377378297c623 275967: 4665482de4227e1a9af127f0134a4110973a876d 275455: 3d6d630728dc3452f9cbeaa6f839b0d5f9f49abc 274431: 6e03995f1e32b28db55d7cd7e46ca3a8189cae77 v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_configfs.c | 11 ----------- trunk/drivers/target/target_core_device.c | 1 - trunk/include/target/target_core_base.h | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index bef9c3dba4bc..46b4ae558f36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9649fa1b8764f64c8cc4293e197e14cd46fe7205 +refs/heads/master: 6f21475576dde397cd2580262209d4080fbd5458 diff --git a/trunk/drivers/target/target_core_configfs.c b/trunk/drivers/target/target_core_configfs.c index e0c1e8a8dd4e..93d4f6a1b798 100644 --- a/trunk/drivers/target/target_core_configfs.c +++ b/trunk/drivers/target/target_core_configfs.c @@ -67,9 +67,6 @@ static struct config_group target_core_hbagroup; static struct config_group alua_group; static struct config_group alua_lu_gps_group; -static DEFINE_SPINLOCK(se_device_lock); -static LIST_HEAD(se_dev_list); - static inline struct se_hba * item_to_hba(struct config_item *item) { @@ -2741,7 +2738,6 @@ static struct config_group *target_core_make_subdev( " struct se_subsystem_dev\n"); goto unlock; } - INIT_LIST_HEAD(&se_dev->se_dev_node); INIT_LIST_HEAD(&se_dev->t10_wwn.t10_vpd_list); spin_lock_init(&se_dev->t10_wwn.t10_vpd_lock); INIT_LIST_HEAD(&se_dev->t10_pr.registration_list); @@ -2777,9 +2773,6 @@ static struct config_group *target_core_make_subdev( " from allocate_virtdevice()\n"); goto out; } - spin_lock(&se_device_lock); - list_add_tail(&se_dev->se_dev_node, &se_dev_list); - spin_unlock(&se_device_lock); config_group_init_type_name(&se_dev->se_dev_group, name, &target_core_dev_cit); @@ -2874,10 +2867,6 @@ static void target_core_drop_subdev( mutex_lock(&hba->hba_access_mutex); t = hba->transport; - spin_lock(&se_device_lock); - list_del(&se_dev->se_dev_node); - spin_unlock(&se_device_lock); - dev_stat_grp = &se_dev->dev_stat_grps.stat_group; for (i = 0; dev_stat_grp->default_groups[i]; i++) { df_item = &dev_stat_grp->default_groups[i]->cg_item; diff --git a/trunk/drivers/target/target_core_device.c b/trunk/drivers/target/target_core_device.c index dd5adb82e3df..e2be1f510da8 100644 --- a/trunk/drivers/target/target_core_device.c +++ b/trunk/drivers/target/target_core_device.c @@ -1584,7 +1584,6 @@ int core_dev_setup_virtual_lun0(void) ret = -ENOMEM; goto out; } - INIT_LIST_HEAD(&se_dev->se_dev_node); INIT_LIST_HEAD(&se_dev->t10_wwn.t10_vpd_list); spin_lock_init(&se_dev->t10_wwn.t10_vpd_lock); INIT_LIST_HEAD(&se_dev->t10_pr.registration_list); diff --git a/trunk/include/target/target_core_base.h b/trunk/include/target/target_core_base.h index 098a15611aba..6873c7dd9145 100644 --- a/trunk/include/target/target_core_base.h +++ b/trunk/include/target/target_core_base.h @@ -669,7 +669,6 @@ struct se_subsystem_dev { struct t10_reservation t10_pr; spinlock_t se_dev_lock; void *se_dev_su_ptr; - struct list_head se_dev_node; struct config_group se_dev_group; /* For T10 Reservations */ struct config_group se_dev_pr_group;