diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-11-28 01:57:01 +0300 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-12-02 08:35:39 +0300 |
| commit | 91e2e39ba89cd627beddafea2a760684adcec89d (patch) | |
| tree | 758023ba0e26dde599761adaf35f0f030907fed9 | |
| parent | f79a897efa6a95d698c4064e48e0a5afddc0ad9f (diff) | |
| download | linux-91e2e39ba89cd627beddafea2a760684adcec89d.tar.xz | |
target: Move dev_pr_cit to struct se_subsystem_api
This patch adds support for dev_pr_cit as an external config_item_type
using TB_CIT_SETUP() helper macro, and sets both ct_item_ops + ct_attr
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_pr_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>
| -rw-r--r-- | drivers/target/target_core_configfs.c | 13 | ||||
| -rw-r--r-- | include/target/target_core_backend.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index 78ed857cc7b9..49d51ba40fca 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c @@ -1011,7 +1011,7 @@ static struct config_item_type target_core_dev_wwn_cit = { /* End functions for struct config_item_type target_core_dev_wwn_cit */ -/* Start functions for struct config_item_type target_core_dev_pr_cit */ +/* Start functions for struct config_item_type tb_dev_pr_cit */ CONFIGFS_EATTR_STRUCT(target_core_dev_pr, se_device); #define SE_DEV_PR_ATTR(_name, _mode) \ @@ -1472,13 +1472,9 @@ static struct configfs_item_operations target_core_dev_pr_ops = { .store_attribute = target_core_dev_pr_attr_store, }; -static struct config_item_type target_core_dev_pr_cit = { - .ct_item_ops = &target_core_dev_pr_ops, - .ct_attrs = target_core_dev_pr_attrs, - .ct_owner = THIS_MODULE, -}; +TB_CIT_SETUP(dev_pr, &target_core_dev_pr_ops, NULL, target_core_dev_pr_attrs); -/* End functions for struct config_item_type target_core_dev_pr_cit */ +/* End functions for struct config_item_type tb_dev_pr_cit */ /* Start functions for struct config_item_type tb_dev_cit */ @@ -2825,7 +2821,7 @@ static struct config_group *target_core_make_subdev( config_group_init_type_name(&dev->dev_attrib.da_group, "attrib", &t->tb_cits.tb_dev_attrib_cit); config_group_init_type_name(&dev->dev_pr_group, "pr", - &target_core_dev_pr_cit); + &t->tb_cits.tb_dev_pr_cit); config_group_init_type_name(&dev->t10_wwn.t10_wwn_group, "wwn", &target_core_dev_wwn_cit); config_group_init_type_name(&dev->t10_alua.alua_tg_pt_gps_group, @@ -3129,6 +3125,7 @@ void target_core_setup_sub_cits(struct se_subsystem_api *sa) { target_core_setup_dev_cit(sa); target_core_setup_dev_attrib_cit(sa); + target_core_setup_dev_pr_cit(sa); } EXPORT_SYMBOL(target_core_setup_sub_cits); diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index 735f85672ec6..a47e78989b6f 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h @@ -8,6 +8,7 @@ struct target_backend_cits { struct config_item_type tb_dev_cit; struct config_item_type tb_dev_attrib_cit; + struct config_item_type tb_dev_pr_cit; }; struct se_subsystem_api { |