aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2014-11-27 18:09:32 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2014-12-02 00:35:39 -0500
commitd23ab570bcb1de0256f1dcea0b8ad3af8e534e40 (patch)
treebcba4e954a82807e18865a461de8f1a294e36165 /drivers/target
parent72aca57bd3fef535972b64c9cd76a088107c589c (diff)
target: Move dev_stat_cit to struct se_subsystem_api
This patch adds support for dev_stat_cit as an external config_item_type using TB_CIT_SETUP() helper macro, and sets only ct_group_ops following existing code. It updates target_core_make_subdev() + target_core_setup_dev_attrib_cit() + struct target_backend_cits, and drops left-over target_core_dev_stat_cit from target_core_configfs.c code and update comments. This patch introduces no functional change from existing code. Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_configfs.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 0cf41ad54bbf..2903d8931625 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -2748,7 +2748,7 @@ static struct config_item_type target_core_alua_cit = {
2748 2748
2749/* End functions for struct config_item_type target_core_alua_cit */ 2749/* End functions for struct config_item_type target_core_alua_cit */
2750 2750
2751/* Start functions for struct config_item_type target_core_stat_cit */ 2751/* Start functions for struct config_item_type tb_dev_stat_cit */
2752 2752
2753static struct config_group *target_core_stat_mkdir( 2753static struct config_group *target_core_stat_mkdir(
2754 struct config_group *group, 2754 struct config_group *group,
@@ -2769,12 +2769,9 @@ static struct configfs_group_operations target_core_stat_group_ops = {
2769 .drop_item = &target_core_stat_rmdir, 2769 .drop_item = &target_core_stat_rmdir,
2770}; 2770};
2771 2771
2772static struct config_item_type target_core_stat_cit = { 2772TB_CIT_SETUP(dev_stat, NULL, &target_core_stat_group_ops, NULL);
2773 .ct_group_ops = &target_core_stat_group_ops,
2774 .ct_owner = THIS_MODULE,
2775};
2776 2773
2777/* End functions for struct config_item_type target_core_stat_cit */ 2774/* End functions for struct config_item_type tb_dev_stat_cit */
2778 2775
2779/* Start functions for struct config_item_type target_core_hba_cit */ 2776/* Start functions for struct config_item_type target_core_hba_cit */
2780 2777
@@ -2820,7 +2817,7 @@ static struct config_group *target_core_make_subdev(
2820 config_group_init_type_name(&dev->t10_alua.alua_tg_pt_gps_group, 2817 config_group_init_type_name(&dev->t10_alua.alua_tg_pt_gps_group,
2821 "alua", &t->tb_cits.tb_dev_alua_tg_pt_gps_cit); 2818 "alua", &t->tb_cits.tb_dev_alua_tg_pt_gps_cit);
2822 config_group_init_type_name(&dev->dev_stat_grps.stat_group, 2819 config_group_init_type_name(&dev->dev_stat_grps.stat_group,
2823 "statistics", &target_core_stat_cit); 2820 "statistics", &t->tb_cits.tb_dev_stat_cit);
2824 2821
2825 dev_cg->default_groups[0] = &dev->dev_attrib.da_group; 2822 dev_cg->default_groups[0] = &dev->dev_attrib.da_group;
2826 dev_cg->default_groups[1] = &dev->dev_pr_group; 2823 dev_cg->default_groups[1] = &dev->dev_pr_group;
@@ -3121,6 +3118,7 @@ void target_core_setup_sub_cits(struct se_subsystem_api *sa)
3121 target_core_setup_dev_pr_cit(sa); 3118 target_core_setup_dev_pr_cit(sa);
3122 target_core_setup_dev_wwn_cit(sa); 3119 target_core_setup_dev_wwn_cit(sa);
3123 target_core_setup_dev_alua_tg_pt_gps_cit(sa); 3120 target_core_setup_dev_alua_tg_pt_gps_cit(sa);
3121 target_core_setup_dev_stat_cit(sa);
3124} 3122}
3125EXPORT_SYMBOL(target_core_setup_sub_cits); 3123EXPORT_SYMBOL(target_core_setup_sub_cits);
3126 3124