From: Andy Grover <agrover@xxxxxxxxxx> The g_ annotation might lead one to believe this is a global variable, when it is per-subsystem. Calling it se_dev_node also connotes the member is for being put on a list, and it is not the head of a list itself. Signed-off-by: Andy Grover <agrover@xxxxxxxxxx> Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx> --- drivers/target/target_core_configfs.c | 6 +++--- drivers/target/target_core_device.c | 2 +- include/target/target_core_base.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index d140258..03cda0e 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c @@ -2748,7 +2748,7 @@ static struct config_group *target_core_make_subdev( " struct se_subsystem_dev\n"); goto unlock; } - INIT_LIST_HEAD(&se_dev->g_se_dev_list); + 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_reservation.registration_list); @@ -2785,7 +2785,7 @@ static struct config_group *target_core_make_subdev( goto out; } spin_lock(&se_global->g_device_lock); - list_add_tail(&se_dev->g_se_dev_list, &se_global->g_se_dev_list); + list_add_tail(&se_dev->se_dev_node, &se_global->g_se_dev_list); spin_unlock(&se_global->g_device_lock); config_group_init_type_name(&se_dev->se_dev_group, name, @@ -2882,7 +2882,7 @@ static void target_core_drop_subdev( t = hba->transport; spin_lock(&se_global->g_device_lock); - list_del(&se_dev->g_se_dev_list); + list_del(&se_dev->se_dev_node); spin_unlock(&se_global->g_device_lock); dev_stat_grp = &DEV_STAT_GRP(se_dev)->stat_group; diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index f03e0cc..4d8da32 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -1589,7 +1589,7 @@ int core_dev_setup_virtual_lun0(void) ret = -ENOMEM; goto out; } - INIT_LIST_HEAD(&se_dev->g_se_dev_list); + 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_reservation.registration_list); diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index e35338d..8467a8d 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -730,7 +730,7 @@ struct se_subsystem_dev { struct t10_reservation_template t10_reservation; spinlock_t se_dev_lock; void *se_dev_su_ptr; - struct list_head g_se_dev_list; + struct list_head se_dev_node; struct config_group se_dev_group; /* For T10 Reservations */ struct config_group se_dev_pr_group; -- 1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html