target/configfs: allocate pointers instead of full struct for default_groups

default_groups is defined as struct config_group **default_groups so
we don't need to allocate a whole struct but only enough space for a
pointer that points there.

(nab: Fix up minor apply breakage in for-next)

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index ff6fd4fb624d44fc4791a62af7e837ba18c10fc1..7c4243ed9ab8d033b8465f546b5b7ebe41811e44 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -803,7 +803,7 @@ static struct se_node_acl *lio_target_make_nodeacl(
        acl = container_of(se_nacl, struct iscsi_node_acl, se_node_acl);
        stats_cg = &se_nacl->acl_fabric_stat_group;
 
-       stats_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       stats_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!stats_cg->default_groups) {
                pr_err("Unable to allocate memory for"
@@ -1268,7 +1268,7 @@ static struct se_wwn *lio_target_call_coreaddtiqn(
         */
        stats_cg = &tiqn->tiqn_wwn.fabric_stat_group;
 
-       stats_cg->default_groups = kzalloc(sizeof(struct config_group) * 6,
+       stats_cg->default_groups = kzalloc(sizeof(struct config_group *) * 6,
                                GFP_KERNEL);
        if (!stats_cg->default_groups) {
                pr_err("Unable to allocate memory for"

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 10d4bfe72763c71350e2a0d997332c710f7e97ee..02fd55d3a76eac3f3aacc34a31ce208bceb57005 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -2496,7 +2496,7 @@ static struct config_group *target_core_make_subdev(
 
        dev_cg = &dev->dev_group;
 
-       dev_cg->default_groups = kzalloc(sizeof(struct config_group) * 7,
+       dev_cg->default_groups = kzalloc(sizeof(struct config_group *) * 7,
                        GFP_KERNEL);
        if (!dev_cg->default_groups)
                goto out_free_device;
@@ -2528,7 +2528,7 @@ static struct config_group *target_core_make_subdev(
        dev->t10_alua.default_tg_pt_gp = tg_pt_gp;
 
        tg_pt_gp_cg = &dev->t10_alua.alua_tg_pt_gps_group;
-       tg_pt_gp_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       tg_pt_gp_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!tg_pt_gp_cg->default_groups) {
                pr_err("Unable to allocate tg_pt_gp_cg->"
@@ -2544,7 +2544,7 @@ static struct config_group *target_core_make_subdev(
         * Add core/$HBA/$DEV/statistics/ default groups
         */
        dev_stat_grp = &dev->dev_stat_grps.stat_group;
-       dev_stat_grp->default_groups = kzalloc(sizeof(struct config_group) * 4,
+       dev_stat_grp->default_groups = kzalloc(sizeof(struct config_group *) * 4,
                                GFP_KERNEL);
        if (!dev_stat_grp->default_groups) {
                pr_err("Unable to allocate dev_stat_grp->default_groups\n");
@@ -2829,7 +2829,7 @@ static int __init target_core_init_configfs(void)
         * and ALUA Logical Unit Group and Target Port Group infrastructure.
         */
        target_cg = &subsys->su_group;
-       target_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       target_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!target_cg->default_groups) {
                pr_err("Unable to allocate target_cg->default_groups\n");
@@ -2845,7 +2845,7 @@ static int __init target_core_init_configfs(void)
         * Create ALUA infrastructure under /sys/kernel/config/target/core/alua/
         */
        hba_cg = &target_core_hbagroup;
-       hba_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       hba_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!hba_cg->default_groups) {
                pr_err("Unable to allocate hba_cg->default_groups\n");
@@ -2861,7 +2861,7 @@ static int __init target_core_init_configfs(void)
         * groups under /sys/kernel/config/target/core/alua/
         */
        alua_cg = &alua_group;
-       alua_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       alua_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                        GFP_KERNEL);
        if (!alua_cg->default_groups) {
                pr_err("Unable to allocate alua_cg->default_groups\n");
@@ -2883,7 +2883,7 @@ static int __init target_core_init_configfs(void)
        }
 
        lu_gp_cg = &alua_lu_gps_group;
-       lu_gp_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       lu_gp_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                        GFP_KERNEL);
        if (!lu_gp_cg->default_groups) {
                pr_err("Unable to allocate lu_gp_cg->default_groups\n");

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 816347c3439201a867e2b9e522e068d6c02fb9b0..efe31a00a7cb9e133eb64ac8eb29eb4ca8e0f919 100644 (file)
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -357,7 +357,7 @@ static struct config_group *target_fabric_make_mappedlun(
        }
 
        lacl_cg = &lacl->se_lun_group;
-       lacl_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       lacl_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!lacl_cg->default_groups) {
                pr_err("Unable to allocate lacl_cg->default_groups\n");
@@ -373,7 +373,7 @@ static struct config_group *target_fabric_make_mappedlun(
        lacl_cg->default_groups[1] = NULL;
 
        ml_stat_grp = &lacl->ml_stat_grps.stat_group;
-       ml_stat_grp->default_groups = kzalloc(sizeof(struct config_group) * 3,
+       ml_stat_grp->default_groups = kzalloc(sizeof(struct config_group *) * 3,
                                GFP_KERNEL);
        if (!ml_stat_grp->default_groups) {
                pr_err("Unable to allocate ml_stat_grp->default_groups\n");
@@ -858,7 +858,7 @@ static struct config_group *target_fabric_make_lun(
                return ERR_PTR(-EINVAL);
 
        lun_cg = &lun->lun_group;
-       lun_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+       lun_cg->default_groups = kzalloc(sizeof(struct config_group *) * 2,
                                GFP_KERNEL);
        if (!lun_cg->default_groups) {
                pr_err("Unable to allocate lun_cg->default_groups\n");