Commit 364e8dd9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs

Pull configfs updates from Christoph Hellwig:

 - A large patch from me to simplify setting up the list of default
   groups by actually implementing it as a list instead of an array.

 - a small Y2083 prep patch from Deepa Dinamani.  Probably doesn't
   matter on it's own, but it seems like he is trying to get rid of all
   CURRENT_TIME uses in file systems, which is a worthwhile goal.

* tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs:
  configfs: switch ->default groups to a linked list
  configfs: Replace CURRENT_TIME by current_fs_time()
parents 48d10bda 1ae1602d
...@@ -250,7 +250,8 @@ child item. ...@@ -250,7 +250,8 @@ child item.
struct config_item cg_item; struct config_item cg_item;
struct list_head cg_children; struct list_head cg_children;
struct configfs_subsystem *cg_subsys; struct configfs_subsystem *cg_subsys;
struct config_group **default_groups; struct list_head default_groups;
struct list_head group_entry;
}; };
void config_group_init(struct config_group *group); void config_group_init(struct config_group *group);
...@@ -420,15 +421,15 @@ These automatic subgroups, or default groups, do not preclude other ...@@ -420,15 +421,15 @@ These automatic subgroups, or default groups, do not preclude other
children of the parent group. If ct_group_ops->make_group() exists, children of the parent group. If ct_group_ops->make_group() exists,
other child groups can be created on the parent group directly. other child groups can be created on the parent group directly.
A configfs subsystem specifies default groups by filling in the A configfs subsystem specifies default groups by adding them using the
NULL-terminated array default_groups on the config_group structure. configfs_add_default_group() function to the parent config_group
Each group in that array is populated in the configfs tree at the same structure. Each added group is populated in the configfs tree at the same
time as the parent group. Similarly, they are removed at the same time time as the parent group. Similarly, they are removed at the same time
as the parent. No extra notification is provided. When a ->drop_item() as the parent. No extra notification is provided. When a ->drop_item()
method call notifies the subsystem the parent group is going away, it method call notifies the subsystem the parent group is going away, it
also means every default group child associated with that parent group. also means every default group child associated with that parent group.
As a consequence of this, default_groups cannot be removed directly via As a consequence of this, default groups cannot be removed directly via
rmdir(2). They also are not considered when rmdir(2) on the parent rmdir(2). They also are not considered when rmdir(2) on the parent
group is checking for children. group is checking for children.
......
...@@ -49,8 +49,6 @@ struct cma_dev_group { ...@@ -49,8 +49,6 @@ struct cma_dev_group {
char name[IB_DEVICE_NAME_MAX]; char name[IB_DEVICE_NAME_MAX];
struct config_group device_group; struct config_group device_group;
struct config_group ports_group; struct config_group ports_group;
struct config_group *default_dev_group[2];
struct config_group **default_ports_group;
struct cma_dev_port_group *ports; struct cma_dev_port_group *ports;
}; };
...@@ -158,7 +156,6 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group, ...@@ -158,7 +156,6 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group,
unsigned int i; unsigned int i;
unsigned int ports_num; unsigned int ports_num;
struct cma_dev_port_group *ports; struct cma_dev_port_group *ports;
struct config_group **ports_group;
int err; int err;
ibdev = cma_get_ib_dev(cma_dev); ibdev = cma_get_ib_dev(cma_dev);
...@@ -169,9 +166,8 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group, ...@@ -169,9 +166,8 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group,
ports_num = ibdev->phys_port_cnt; ports_num = ibdev->phys_port_cnt;
ports = kcalloc(ports_num, sizeof(*cma_dev_group->ports), ports = kcalloc(ports_num, sizeof(*cma_dev_group->ports),
GFP_KERNEL); GFP_KERNEL);
ports_group = kcalloc(ports_num + 1, sizeof(*ports_group), GFP_KERNEL);
if (!ports || !ports_group) { if (!ports) {
err = -ENOMEM; err = -ENOMEM;
goto free; goto free;
} }
...@@ -185,18 +181,16 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group, ...@@ -185,18 +181,16 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group,
config_group_init_type_name(&ports[i].group, config_group_init_type_name(&ports[i].group,
port_str, port_str,
&cma_port_group_type); &cma_port_group_type);
ports_group[i] = &ports[i].group; configfs_add_default_group(&ports[i].group,
&cma_dev_group->ports_group);
} }
ports_group[i] = NULL;
cma_dev_group->default_ports_group = ports_group;
cma_dev_group->ports = ports; cma_dev_group->ports = ports;
return 0; return 0;
free: free:
kfree(ports); kfree(ports);
kfree(ports_group);
cma_dev_group->ports = NULL; cma_dev_group->ports = NULL;
cma_dev_group->default_ports_group = NULL;
return err; return err;
} }
...@@ -220,9 +214,7 @@ static void release_cma_ports_group(struct config_item *item) ...@@ -220,9 +214,7 @@ static void release_cma_ports_group(struct config_item *item)
ports_group); ports_group);
kfree(cma_dev_group->ports); kfree(cma_dev_group->ports);
kfree(cma_dev_group->default_ports_group);
cma_dev_group->ports = NULL; cma_dev_group->ports = NULL;
cma_dev_group->default_ports_group = NULL;
}; };
static struct configfs_item_operations cma_ports_item_ops = { static struct configfs_item_operations cma_ports_item_ops = {
...@@ -263,22 +255,17 @@ static struct config_group *make_cma_dev(struct config_group *group, ...@@ -263,22 +255,17 @@ static struct config_group *make_cma_dev(struct config_group *group,
strncpy(cma_dev_group->name, name, sizeof(cma_dev_group->name)); strncpy(cma_dev_group->name, name, sizeof(cma_dev_group->name));
err = make_cma_ports(cma_dev_group, cma_dev);
if (err)
goto fail;
cma_dev_group->ports_group.default_groups =
cma_dev_group->default_ports_group;
config_group_init_type_name(&cma_dev_group->ports_group, "ports", config_group_init_type_name(&cma_dev_group->ports_group, "ports",
&cma_ports_group_type); &cma_ports_group_type);
cma_dev_group->device_group.default_groups err = make_cma_ports(cma_dev_group, cma_dev);
= cma_dev_group->default_dev_group; if (err)
cma_dev_group->default_dev_group[0] = &cma_dev_group->ports_group; goto fail;
cma_dev_group->default_dev_group[1] = NULL;
config_group_init_type_name(&cma_dev_group->device_group, name, config_group_init_type_name(&cma_dev_group->device_group, name,
&cma_device_group_type); &cma_device_group_type);
configfs_add_default_group(&cma_dev_group->ports_group,
&cma_dev_group->device_group);
cma_deref_dev(cma_dev); cma_deref_dev(cma_dev);
return &cma_dev_group->device_group; return &cma_dev_group->device_group;
......
...@@ -771,21 +771,11 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl, ...@@ -771,21 +771,11 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl,
{ {
struct iscsi_node_acl *acl = struct iscsi_node_acl *acl =
container_of(se_nacl, struct iscsi_node_acl, se_node_acl); container_of(se_nacl, struct iscsi_node_acl, se_node_acl);
struct config_group *stats_cg = &se_nacl->acl_fabric_stat_group;
stats_cg->default_groups = kmalloc(sizeof(struct config_group *) * 2,
GFP_KERNEL);
if (!stats_cg->default_groups) {
pr_err("Unable to allocate memory for"
" stats_cg->default_groups\n");
return -ENOMEM;
}
stats_cg->default_groups[0] = &acl->node_stat_grps.iscsi_sess_stats_group;
stats_cg->default_groups[1] = NULL;
config_group_init_type_name(&acl->node_stat_grps.iscsi_sess_stats_group, config_group_init_type_name(&acl->node_stat_grps.iscsi_sess_stats_group,
"iscsi_sess_stats", &iscsi_stat_sess_cit); "iscsi_sess_stats", &iscsi_stat_sess_cit);
configfs_add_default_group(&acl->node_stat_grps.iscsi_sess_stats_group,
&se_nacl->acl_fabric_stat_group);
return 0; return 0;
} }
...@@ -793,17 +783,8 @@ static void lio_target_cleanup_nodeacl( struct se_node_acl *se_nacl) ...@@ -793,17 +783,8 @@ static void lio_target_cleanup_nodeacl( struct se_node_acl *se_nacl)
{ {
struct iscsi_node_acl *acl = container_of(se_nacl, struct iscsi_node_acl *acl = container_of(se_nacl,
struct iscsi_node_acl, se_node_acl); struct iscsi_node_acl, se_node_acl);
struct config_item *df_item;
struct config_group *stats_cg; configfs_remove_default_groups(&acl->se_node_acl.acl_fabric_stat_group);
int i;
stats_cg = &acl->se_node_acl.acl_fabric_stat_group;
for (i = 0; stats_cg->default_groups[i]; i++) {
df_item = &stats_cg->default_groups[i]->cg_item;
stats_cg->default_groups[i] = NULL;
config_item_put(df_item);
}
kfree(stats_cg->default_groups);
} }
/* End items for lio_target_acl_cit */ /* End items for lio_target_acl_cit */
...@@ -1260,42 +1241,37 @@ static struct se_wwn *lio_target_call_coreaddtiqn( ...@@ -1260,42 +1241,37 @@ static struct se_wwn *lio_target_call_coreaddtiqn(
struct config_group *group, struct config_group *group,
const char *name) const char *name)
{ {
struct config_group *stats_cg;
struct iscsi_tiqn *tiqn; struct iscsi_tiqn *tiqn;
tiqn = iscsit_add_tiqn((unsigned char *)name); tiqn = iscsit_add_tiqn((unsigned char *)name);
if (IS_ERR(tiqn)) if (IS_ERR(tiqn))
return ERR_CAST(tiqn); return ERR_CAST(tiqn);
/*
* Setup struct iscsi_wwn_stat_grps for se_wwn->fabric_stat_group.
*/
stats_cg = &tiqn->tiqn_wwn.fabric_stat_group;
stats_cg->default_groups = kmalloc(sizeof(struct config_group *) * 6,
GFP_KERNEL);
if (!stats_cg->default_groups) {
pr_err("Unable to allocate memory for"
" stats_cg->default_groups\n");
iscsit_del_tiqn(tiqn);
return ERR_PTR(-ENOMEM);
}
stats_cg->default_groups[0] = &tiqn->tiqn_stat_grps.iscsi_instance_group;
stats_cg->default_groups[1] = &tiqn->tiqn_stat_grps.iscsi_sess_err_group;
stats_cg->default_groups[2] = &tiqn->tiqn_stat_grps.iscsi_tgt_attr_group;
stats_cg->default_groups[3] = &tiqn->tiqn_stat_grps.iscsi_login_stats_group;
stats_cg->default_groups[4] = &tiqn->tiqn_stat_grps.iscsi_logout_stats_group;
stats_cg->default_groups[5] = NULL;
config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_instance_group, config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_instance_group,
"iscsi_instance", &iscsi_stat_instance_cit); "iscsi_instance", &iscsi_stat_instance_cit);
configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_instance_group,
&tiqn->tiqn_wwn.fabric_stat_group);
config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_sess_err_group, config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_sess_err_group,
"iscsi_sess_err", &iscsi_stat_sess_err_cit); "iscsi_sess_err", &iscsi_stat_sess_err_cit);
configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_sess_err_group,
&tiqn->tiqn_wwn.fabric_stat_group);
config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_tgt_attr_group, config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_tgt_attr_group,
"iscsi_tgt_attr", &iscsi_stat_tgt_attr_cit); "iscsi_tgt_attr", &iscsi_stat_tgt_attr_cit);
configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_tgt_attr_group,
&tiqn->tiqn_wwn.fabric_stat_group);
config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_login_stats_group, config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_login_stats_group,
"iscsi_login_stats", &iscsi_stat_login_cit); "iscsi_login_stats", &iscsi_stat_login_cit);
configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_login_stats_group,
&tiqn->tiqn_wwn.fabric_stat_group);
config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_logout_stats_group, config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_logout_stats_group,
"iscsi_logout_stats", &iscsi_stat_logout_cit); "iscsi_logout_stats", &iscsi_stat_logout_cit);
configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_logout_stats_group,
&tiqn->tiqn_wwn.fabric_stat_group);
pr_debug("LIO_Target_ConfigFS: REGISTER -> %s\n", tiqn->tiqn); pr_debug("LIO_Target_ConfigFS: REGISTER -> %s\n", tiqn->tiqn);
pr_debug("LIO_Target_ConfigFS: REGISTER -> Allocated Node:" pr_debug("LIO_Target_ConfigFS: REGISTER -> Allocated Node:"
...@@ -1307,17 +1283,8 @@ static void lio_target_call_coredeltiqn( ...@@ -1307,17 +1283,8 @@ static void lio_target_call_coredeltiqn(
struct se_wwn *wwn) struct se_wwn *wwn)
{ {
struct iscsi_tiqn *tiqn = container_of(wwn, struct iscsi_tiqn, tiqn_wwn); struct iscsi_tiqn *tiqn = container_of(wwn, struct iscsi_tiqn, tiqn_wwn);
struct config_item *df_item;
struct config_group *stats_cg; configfs_remove_default_groups(&tiqn->tiqn_wwn.fabric_stat_group);
int i;
stats_cg = &tiqn->tiqn_wwn.fabric_stat_group;
for (i = 0; stats_cg->default_groups[i]; i++) {
df_item = &stats_cg->default_groups[i]->cg_item;
stats_cg->default_groups[i] = NULL;
config_item_put(df_item);
}
kfree(stats_cg->default_groups);
pr_debug("LIO_Target_ConfigFS: DEREGISTER -> %s\n", pr_debug("LIO_Target_ConfigFS: DEREGISTER -> %s\n",
tiqn->tiqn); tiqn->tiqn);
......
This diff is collapsed.
...@@ -22,7 +22,6 @@ struct target_fabric_configfs { ...@@ -22,7 +22,6 @@ struct target_fabric_configfs {
struct list_head tf_list; struct list_head tf_list;
struct config_group tf_group; struct config_group tf_group;
struct config_group tf_disc_group; struct config_group tf_disc_group;
struct config_group *tf_default_groups[2];
const struct target_core_fabric_ops *tf_ops; const struct target_core_fabric_ops *tf_ops;
struct config_item_type tf_discovery_cit; struct config_item_type tf_discovery_cit;
......
...@@ -407,19 +407,20 @@ static struct config_item_type target_stat_scsi_lu_cit = { ...@@ -407,19 +407,20 @@ static struct config_item_type target_stat_scsi_lu_cit = {
*/ */
void target_stat_setup_dev_default_groups(struct se_device *dev) void target_stat_setup_dev_default_groups(struct se_device *dev)
{ {
struct config_group *dev_stat_grp = &dev->dev_stat_grps.stat_group;
config_group_init_type_name(&dev->dev_stat_grps.scsi_dev_group, config_group_init_type_name(&dev->dev_stat_grps.scsi_dev_group,
"scsi_dev", &target_stat_scsi_dev_cit); "scsi_dev", &target_stat_scsi_dev_cit);
configfs_add_default_group(&dev->dev_stat_grps.scsi_dev_group,
&dev->dev_stat_grps.stat_group);
config_group_init_type_name(&dev->dev_stat_grps.scsi_tgt_dev_group, config_group_init_type_name(&dev->dev_stat_grps.scsi_tgt_dev_group,
"scsi_tgt_dev", &target_stat_scsi_tgt_dev_cit); "scsi_tgt_dev", &target_stat_scsi_tgt_dev_cit);
configfs_add_default_group(&dev->dev_stat_grps.scsi_tgt_dev_group,
&dev->dev_stat_grps.stat_group);
config_group_init_type_name(&dev->dev_stat_grps.scsi_lu_group, config_group_init_type_name(&dev->dev_stat_grps.scsi_lu_group,
"scsi_lu", &target_stat_scsi_lu_cit); "scsi_lu", &target_stat_scsi_lu_cit);
configfs_add_default_group(&dev->dev_stat_grps.scsi_lu_group,
dev_stat_grp->default_groups[0] = &dev->dev_stat_grps.scsi_dev_group; &dev->dev_stat_grps.stat_group);
dev_stat_grp->default_groups[1] = &dev->dev_stat_grps.scsi_tgt_dev_group;
dev_stat_grp->default_groups[2] = &dev->dev_stat_grps.scsi_lu_group;
dev_stat_grp->default_groups[3] = NULL;
} }
/* /*
...@@ -818,19 +819,20 @@ static struct config_item_type target_stat_scsi_transport_cit = { ...@@ -818,19 +819,20 @@ static struct config_item_type target_stat_scsi_transport_cit = {
*/ */
void target_stat_setup_port_default_groups(struct se_lun *lun) void target_stat_setup_port_default_groups(struct se_lun *lun)
{ {
struct config_group *port_stat_grp = &lun->port_stat_grps.stat_group;
config_group_init_type_name(&lun->port_stat_grps.scsi_port_group, config_group_init_type_name(&lun->port_stat_grps.scsi_port_group,
"scsi_port", &target_stat_scsi_port_cit); "scsi_port", &target_stat_scsi_port_cit);
configfs_add_default_group(&lun->port_stat_grps.scsi_port_group,
&lun->port_stat_grps.stat_group);
config_group_init_type_name(&lun->port_stat_grps.scsi_tgt_port_group, config_group_init_type_name(&lun->port_stat_grps.scsi_tgt_port_group,
"scsi_tgt_port", &target_stat_scsi_tgt_port_cit); "scsi_tgt_port", &target_stat_scsi_tgt_port_cit);
configfs_add_default_group(&lun->port_stat_grps.scsi_tgt_port_group,
&lun->port_stat_grps.stat_group);
config_group_init_type_name(&lun->port_stat_grps.scsi_transport_group, config_group_init_type_name(&lun->port_stat_grps.scsi_transport_group,
"scsi_transport", &target_stat_scsi_transport_cit); "scsi_transport", &target_stat_scsi_transport_cit);
configfs_add_default_group(&lun->port_stat_grps.scsi_transport_group,
port_stat_grp->default_groups[0] = &lun->port_stat_grps.scsi_port_group; &lun->port_stat_grps.stat_group);
port_stat_grp->default_groups[1] = &lun->port_stat_grps.scsi_tgt_port_group;
port_stat_grp->default_groups[2] = &lun->port_stat_grps.scsi_transport_group;
port_stat_grp->default_groups[3] = NULL;
} }
/* /*
...@@ -1351,14 +1353,13 @@ static struct config_item_type target_stat_scsi_att_intr_port_cit = { ...@@ -1351,14 +1353,13 @@ static struct config_item_type target_stat_scsi_att_intr_port_cit = {
*/ */
void target_stat_setup_mappedlun_default_groups(struct se_lun_acl *lacl) void target_stat_setup_mappedlun_default_groups(struct se_lun_acl *lacl)
{ {
struct config_group *ml_stat_grp = &lacl->ml_stat_grps.stat_group;
config_group_init_type_name(&lacl->ml_stat_grps.scsi_auth_intr_group, config_group_init_type_name(&lacl->ml_stat_grps.scsi_auth_intr_group,
"scsi_auth_intr", &target_stat_scsi_auth_intr_cit); "scsi_auth_intr", &target_stat_scsi_auth_intr_cit);
configfs_add_default_group(&lacl->ml_stat_grps.scsi_auth_intr_group,
&lacl->ml_stat_grps.stat_group);
config_group_init_type_name(&lacl->ml_stat_grps.scsi_att_intr_port_group, config_group_init_type_name(&lacl->ml_stat_grps.scsi_att_intr_port_group,
"scsi_att_intr_port", &target_stat_scsi_att_intr_port_cit); "scsi_att_intr_port", &target_stat_scsi_att_intr_port_cit);
configfs_add_default_group(&lacl->ml_stat_grps.scsi_att_intr_port_group,
ml_stat_grp->default_groups[0] = &lacl->ml_stat_grps.scsi_auth_intr_group; &lacl->ml_stat_grps.stat_group);
ml_stat_grp->default_groups[1] = &lacl->ml_stat_grps.scsi_att_intr_port_group;
ml_stat_grp->default_groups[2] = NULL;
} }
...@@ -49,7 +49,6 @@ struct gadget_info { ...@@ -49,7 +49,6 @@ struct gadget_info {
struct config_group configs_group; struct config_group configs_group;
struct config_group strings_group; struct config_group strings_group;
struct config_group os_desc_group; struct config_group os_desc_group;
struct config_group *default_groups[5];
struct mutex lock; struct mutex lock;
struct usb_gadget_strings *gstrings[MAX_USB_STRING_LANGS + 1]; struct usb_gadget_strings *gstrings[MAX_USB_STRING_LANGS + 1];
...@@ -71,7 +70,6 @@ static inline struct gadget_info *to_gadget_info(struct config_item *item) ...@@ -71,7 +70,6 @@ static inline struct gadget_info *to_gadget_info(struct config_item *item)
struct config_usb_cfg { struct config_usb_cfg {
struct config_group group; struct config_group group;
struct config_group strings_group; struct config_group strings_group;
struct config_group *default_groups[2];
struct list_head string_list; struct list_head string_list;
struct usb_configuration c; struct usb_configuration c;
struct list_head func_list; struct list_head func_list;
...@@ -666,13 +664,12 @@ static struct config_group *config_desc_make( ...@@ -666,13 +664,12 @@ static struct config_group *config_desc_make(
INIT_LIST_HEAD(&cfg->string_list); INIT_LIST_HEAD(&cfg->string_list);
INIT_LIST_HEAD(&cfg->func_list); INIT_LIST_HEAD(&cfg->func_list);
cfg->group.default_groups = cfg->default_groups;
cfg->default_groups[0] = &cfg->strings_group;
config_group_init_type_name(&cfg->group, name, config_group_init_type_name(&cfg->group, name,
&gadget_config_type); &gadget_config_type);
config_group_init_type_name(&cfg->strings_group, "strings", config_group_init_type_name(&cfg->strings_group, "strings",
&gadget_config_name_strings_type); &gadget_config_name_strings_type);
configfs_add_default_group(&cfg->strings_group, &cfg->group);
ret = usb_add_config_only(&gi->cdev, &cfg->c); ret = usb_add_config_only(&gi->cdev, &cfg->c);
if (ret) if (ret)
...@@ -1149,15 +1146,11 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent, ...@@ -1149,15 +1146,11 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent,
char **names, char **names,
struct module *owner) struct module *owner)
{ {
struct config_group **f_default_groups, *os_desc_group, struct config_group *os_desc_group;
**interface_groups;
struct config_item_type *os_desc_type, *interface_type; struct config_item_type *os_desc_type, *interface_type;
vla_group(data_chunk); vla_group(data_chunk);
vla_item(data_chunk, struct config_group *, f_default_groups, 2);
vla_item(data_chunk, struct config_group, os_desc_group, 1); vla_item(data_chunk, struct config_group, os_desc_group, 1);
vla_item(data_chunk, struct config_group *, interface_groups,
n_interf + 1);
vla_item(data_chunk, struct config_item_type, os_desc_type, 1); vla_item(data_chunk, struct config_item_type, os_desc_type, 1);
vla_item(data_chunk, struct config_item_type, interface_type, 1); vla_item(data_chunk, struct config_item_type, interface_type, 1);
...@@ -1165,18 +1158,14 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent, ...@@ -1165,18 +1158,14 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent,
if (!vlabuf) if (!vlabuf)
return -ENOMEM; return -ENOMEM;
f_default_groups = vla_ptr(vlabuf, data_chunk, f_default_groups);
os_desc_group = vla_ptr(vlabuf, data_chunk, os_desc_group); os_desc_group = vla_ptr(vlabuf, data_chunk, os_desc_group);
os_desc_type = vla_ptr(vlabuf, data_chunk, os_desc_type); os_desc_type = vla_ptr(vlabuf, data_chunk, os_desc_type);
interface_groups = vla_ptr(vlabuf, data_chunk, interface_groups);
interface_type = vla_ptr(vlabuf, data_chunk, interface_type); interface_type = vla_ptr(vlabuf, data_chunk, interface_type);
parent->default_groups = f_default_groups;
os_desc_type->ct_owner = owner; os_desc_type->ct_owner = owner;
config_group_init_type_name(os_desc_group, "os_desc", os_desc_type); config_group_init_type_name(os_desc_group, "os_desc", os_desc_type);
f_default_groups[0] = os_desc_group; configfs_add_default_group(os_desc_group, parent);
os_desc_group->default_groups = interface_groups;
interface_type->ct_group_ops = &interf_grp_ops; interface_type->ct_group_ops = &interf_grp_ops;
interface_type->ct_attrs = interf_grp_attrs; interface_type->ct_attrs = interf_grp_attrs;
interface_type->ct_owner = owner; interface_type->ct_owner = owner;
...@@ -1189,7 +1178,7 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent, ...@@ -1189,7 +1178,7 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent,
config_group_init_type_name(&d->group, "", interface_type); config_group_init_type_name(&d->group, "", interface_type);
config_item_set_name(&d->group.cg_item, "interface.%s", config_item_set_name(&d->group.cg_item, "interface.%s",
names[n_interf]); names[n_interf]);
interface_groups[n_interf] = &d->group; configfs_add_default_group(&d->group, os_desc_group);
} }
return 0; return 0;
...@@ -1424,20 +1413,23 @@ static struct config_group *gadgets_make( ...@@ -1424,20 +1413,23 @@ static struct config_group *gadgets_make(
if (!gi) if (!gi)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
gi->group.default_groups = gi->default_groups; config_group_init_type_name(&gi->group, name, &gadget_root_type);
gi->group.default_groups[0] = &gi->functions_group;
gi->group.default_groups[1] = &gi->configs_group;
gi->group.default_groups[2] = &gi->strings_group;
gi->group.default_groups[3] = &gi->os_desc_group;
config_group_init_type_name(&gi->functions_group, "functions", config_group_init_type_name(&gi->functions_group, "functions",
&functions_type); &functions_type);
configfs_add_default_group(&gi->functions_group, &gi->group);
config_group_init_type_name(&gi->configs_group, "configs", config_group_init_type_name(&gi->configs_group, "configs",
&config_desc_type); &config_desc_type);
configfs_add_default_group(&gi->configs_group, &gi->group);
config_group_init_type_name(&gi->strings_group, "strings", config_group_init_type_name(&gi->strings_group, "strings",
&gadget_strings_strings_type); &gadget_strings_strings_type);
configfs_add_default_group(&gi->strings_group, &gi->group);
config_group_init_type_name(&gi->os_desc_group, "os_desc", config_group_init_type_name(&gi->os_desc_group, "os_desc",
&os_desc_type); &os_desc_type);
configfs_add_default_group(&gi->os_desc_group, &gi->group);
gi->composite.bind = configfs_do_nothing; gi->composite.bind = configfs_do_nothing;
gi->composite.unbind = configfs_do_nothing; gi->composite.unbind = configfs_do_nothing;
...@@ -1462,8 +1454,6 @@ static struct config_group *gadgets_make( ...@@ -1462,8 +1454,6 @@ static struct config_group *gadgets_make(
if (!gi->composite.gadget_driver.function) if (!gi->composite.gadget_driver.function)
goto err; goto err;
config_group_init_type_name(&gi->group, name,
&gadget_root_type);
return &gi->group; return &gi->group;
err: err:
kfree(gi); kfree(gi);
......
...@@ -3484,12 +3484,12 @@ static struct usb_function_instance *fsg_alloc_inst(void) ...@@ -3484,12 +3484,12 @@ static struct usb_function_instance *fsg_alloc_inst(void)
opts->lun0.lun = opts->common->luns[0]; opts->lun0.lun = opts->common->luns[0];
opts->lun0.lun_id = 0; opts->lun0.lun_id = 0;
config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type);
opts->default_groups[0] = &opts->lun0.group;
opts->func_inst.group.default_groups = opts->default_groups;
config_group_init_type_name(&opts->func_inst.group, "", &fsg_func_type); config_group_init_type_name(&opts->func_inst.group, "", &fsg_func_type);
config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type);
configfs_add_default_group(&opts->lun0.group, &opts->func_inst.group);
return &opts->func_inst; return &opts->func_inst;
release_buffers: release_buffers:
......
...@@ -889,7 +889,6 @@ static void rndis_free_inst(struct usb_function_instance *f) ...@@ -889,7 +889,6 @@ static void rndis_free_inst(struct usb_function_instance *f)
free_netdev(opts->net); free_netdev(opts->net);
} }
kfree(opts->rndis_os_desc.group.default_groups); /* single VLA chunk */
kfree(opts); kfree(opts);
} }
...@@ -916,10 +915,10 @@ static struct usb_function_instance *rndis_alloc_inst(void) ...@@ -916,10 +915,10 @@ static struct usb_function_instance *rndis_alloc_inst(void)
descs[0] = &opts->rndis_os_desc; descs[0] = &opts->rndis_os_desc;
names[0] = "rndis"; names[0] = "rndis";
usb_os_desc_prepare_interf_dir(&opts->func_inst.group, 1, descs,
names, THIS_MODULE);
config_group_init_type_name(&opts->func_inst.group, "", config_group_init_type_name(&opts->func_inst.group, "",
&rndis_func_type); &rndis_func_type);
usb_os_desc_prepare_interf_dir(&opts->func_inst.group, 1, descs,
names, THIS_MODULE);
return &opts->func_inst; return &opts->func_inst;
} }
......
...@@ -272,11 +272,6 @@ static struct config_item_type uvcg_default_processing_type = { ...@@ -272,11 +272,6 @@ static struct config_item_type uvcg_default_processing_type = {
/* struct uvcg_processing {}; */ /* struct uvcg_processing {}; */
static struct config_group *uvcg_processing_default_groups[] = {
&uvcg_default_processing.group,
NULL,
};
/* control/processing */ /* control/processing */
static struct uvcg_processing_grp { static struct uvcg_processing_grp {
struct config_group group; struct config_group group;
...@@ -394,11 +389,6 @@ static struct config_item_type uvcg_default_camera_type = { ...@@ -394,11 +389,6 @@ static struct config_item_type uvcg_default_camera_type = {
/* struct uvcg_camera {}; */ /* struct uvcg_camera {}; */
static struct config_group *uvcg_camera_default_groups[] = {
&uvcg_default_camera.group,
NULL,
};
/* control/terminal/camera */ /* control/terminal/camera */
static struct uvcg_camera_grp { static struct uvcg_camera_grp {
struct config_group group; struct config_group group;
...@@ -477,11 +467,6 @@ static struct config_item_type uvcg_default_output_type = { ...@@ -477,11 +467,6 @@ static struct config_item_type uvcg_default_output_type = {
/* struct uvcg_output {}; */ /* struct uvcg_output {}; */
static struct config_group *uvcg_output_default_groups[] = {
&uvcg_default_output.group,
NULL,
};
/* control/terminal/output */ /* control/terminal/output */
static struct uvcg_output_grp { static struct uvcg_output_grp {
struct config_group group; struct config_group group;
...@@ -491,12 +476,6 @@ static struct config_item_type uvcg_output_grp_type = { ...@@ -491,12 +476,6 @@ static struct config_item_type uvcg_output_grp_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_terminal_default_groups[] = {
&uvcg_camera_grp.group,
&uvcg_output_grp.group,
NULL,
};
/* control/terminal */ /* control/terminal */
static struct uvcg_terminal_grp { static struct uvcg_terminal_grp {
struct config_group group; struct config_group group;
...@@ -619,12 +598,6 @@ static struct config_item_type uvcg_control_class_type = { ...@@ -619,12 +598,6 @@ static struct config_item_type uvcg_control_class_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_control_class_default_groups[] = {
&uvcg_control_class_fs.group,
&uvcg_control_class_ss.group,
NULL,
};
/* control/class */ /* control/class */
static struct uvcg_control_class_grp { static struct uvcg_control_class_grp {
struct config_group group; struct config_group group;
...@@ -634,14 +607,6 @@ static struct config_item_type uvcg_control_class_grp_type = { ...@@ -634,14 +607,6 @@ static struct config_item_type uvcg_control_class_grp_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_control_default_groups[] = {
&uvcg_control_header_grp.group,
&uvcg_processing_grp.group,
&uvcg_terminal_grp.group,
&uvcg_control_class_grp.group,
NULL,
};
/* control */ /* control */
static struct uvcg_control_grp { static struct uvcg_control_grp {
struct config_group group; struct config_group group;
...@@ -1780,11 +1745,6 @@ static struct config_item_type uvcg_default_color_matching_type = { ...@@ -1780,11 +1745,6 @@ static struct config_item_type uvcg_default_color_matching_type = {
/* struct uvcg_color_matching {}; */ /* struct uvcg_color_matching {}; */
static struct config_group *uvcg_color_matching_default_groups[] = {
&uvcg_default_color_matching.group,
NULL,
};
/* streaming/color_matching */ /* streaming/color_matching */
static struct uvcg_color_matching_grp { static struct uvcg_color_matching_grp {
struct config_group group; struct config_group group;
...@@ -2145,13 +2105,6 @@ static struct config_item_type uvcg_streaming_class_type = { ...@@ -2145,13 +2105,6 @@ static struct config_item_type uvcg_streaming_class_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_streaming_class_default_groups[] = {
&uvcg_streaming_class_fs.group,
&uvcg_streaming_class_hs.group,
&uvcg_streaming_class_ss.group,
NULL,
};
/* streaming/class */ /* streaming/class */
static struct uvcg_streaming_class_grp { static struct uvcg_streaming_class_grp {
struct config_group group; struct config_group group;
...@@ -2161,15 +2114,6 @@ static struct config_item_type uvcg_streaming_class_grp_type = { ...@@ -2161,15 +2114,6 @@ static struct config_item_type uvcg_streaming_class_grp_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_streaming_default_groups[] = {
&uvcg_streaming_header_grp.group,
&uvcg_uncompressed_grp.group,
&uvcg_mjpeg_grp.group,
&uvcg_color_matching_grp.group,
&uvcg_streaming_class_grp.group,
NULL,
};
/* streaming */ /* streaming */
static struct uvcg_streaming_grp { static struct uvcg_streaming_grp {
struct config_group group; struct config_group group;
...@@ -2179,12 +2123,6 @@ static struct config_item_type uvcg_streaming_grp_type = { ...@@ -2179,12 +2123,6 @@ static struct config_item_type uvcg_streaming_grp_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static struct config_group *uvcg_default_groups[] = {
&uvcg_control_grp.group,
&uvcg_streaming_grp.group,
NULL,
};
static inline struct f_uvc_opts *to_f_uvc_opts(struct config_item *item) static inline struct f_uvc_opts *to_f_uvc_opts(struct config_item *item)
{ {
return container_of(to_config_group(item), struct f_uvc_opts, return container_of(to_config_group(item), struct f_uvc_opts,
...@@ -2273,59 +2211,64 @@ static struct config_item_type uvc_func_type = { ...@@ -2273,59 +2211,64 @@ static struct config_item_type uvc_func_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
static inline void uvcg_init_group(struct config_group *g,
struct config_group **default_groups,
const char *name,
struct config_item_type *type)
{
g->default_groups = default_groups;
config_group_init_type_name(g, name, type);
}
int uvcg_attach_configfs(struct f_uvc_opts *opts) int uvcg_attach_configfs(struct f_uvc_opts *opts)
{ {
config_group_init_type_name(&uvcg_control_header_grp.group, config_group_init_type_name(&uvcg_control_header_grp.group,
"header", "header",
&uvcg_control_header_grp_type); &uvcg_control_header_grp_type);
config_group_init_type_name(&uvcg_default_processing.group, config_group_init_type_name(&uvcg_default_processing.group,
"default", "default", &uvcg_default_processing_type);
&uvcg_default_processing_type); config_group_init_type_name(&uvcg_processing_grp.group,
uvcg_init_group(&uvcg_processing_grp.group, "processing", &uvcg_processing_grp_type);
uvcg_processing_default_groups, configfs_add_default_group(&uvcg_default_processing.group,
"processing", &uvcg_processing_grp.group);
&uvcg_processing_grp_type);
config_group_init_type_name(&uvcg_default_camera.group, config_group_init_type_name(&uvcg_default_camera.group,
"default", "default", &uvcg_default_camera_type);
&uvcg_default_camera_type); config_group_init_type_name(&uvcg_camera_grp.group,
uvcg_init_group(&uvcg_camera_grp.group, "camera", &uvcg_camera_grp_type);
uvcg_camera_default_groups, configfs_add_default_group(&uvcg_default_camera.group,
"camera", &uvcg_camera_grp.group);
&uvcg_camera_grp_type);
config_group_init_type_name(&uvcg_default_output.group, config_group_init_type_name(&uvcg_default_output.group,
"default", "default", &uvcg_default_output_type);
&uvcg_default_output_type); config_group_init_type_name(&uvcg_output_grp.group,
uvcg_init_group(&uvcg_output_grp.group, "output", &uvcg_output_grp_type);
uvcg_output_default_groups, configfs_add_default_group(&uvcg_default_output.group,
"output", &uvcg_output_grp.group);
&uvcg_output_grp_type);
uvcg_init_group(&uvcg_terminal_grp.group, config_group_init_type_name(&uvcg_terminal_grp.group,
uvcg_terminal_default_groups, "terminal", &uvcg_terminal_grp_type);
"terminal", configfs_add_default_group(&uvcg_camera_grp.group,
&uvcg_terminal_grp_type); &uvcg_terminal_grp.group);
configfs_add_default_group(&uvcg_output_grp.group,
&uvcg_terminal_grp.group);
config_group_init_type_name(&uvcg_control_class_fs.group, config_group_init_type_name(&uvcg_control_class_fs.group,
"fs", "fs", &uvcg_control_class_type);
&uvcg_control_class_type);
config_group_init_type_name(&uvcg_control_class_ss.group, config_group_init_type_name(&uvcg_control_class_ss.group,
"ss", "ss", &uvcg_control_class_type);
&uvcg_control_class_type); config_group_init_type_name(&uvcg_control_class_grp.group,
uvcg_init_group(&uvcg_control_class_grp.group,
uvcg_control_class_default_groups,
"class", "class",
&uvcg_control_class_grp_type); &uvcg_control_class_grp_type);
uvcg_init_group(&uvcg_control_grp.group, configfs_add_default_group(&uvcg_control_class_fs.group,
uvcg_control_default_groups, &uvcg_control_class_grp.group);
configfs_add_default_group(&uvcg_control_class_ss.group,
&uvcg_control_class_grp.group);
config_group_init_type_name(&uvcg_control_grp.group,
"control", "control",
&uvcg_control_grp_type); &uvcg_control_grp_type);
configfs_add_default_group(&uvcg_control_header_grp.group,
&uvcg_control_grp.group);
configfs_add_default_group(&uvcg_processing_grp.group,
&uvcg_control_grp.group);
configfs_add_default_group(&uvcg_terminal_grp.group,
&uvcg_control_grp.group);
configfs_add_default_group(&uvcg_control_class_grp.group,
&uvcg_control_grp.group);
config_group_init_type_name(&uvcg_streaming_header_grp.group, config_group_init_type_name(&uvcg_streaming_header_grp.group,
"header", "header",
&uvcg_streaming_header_grp_type); &uvcg_streaming_header_grp_type);
...@@ -2338,30 +2281,47 @@ int uvcg_attach_configfs(struct f_uvc_opts *opts) ...@@ -2338,30 +2281,47 @@ int uvcg_attach_configfs(struct f_uvc_opts *opts)
config_group_init_type_name(&uvcg_default_color_matching.group, config_group_init_type_name(&uvcg_default_color_matching.group,
"default", "default",
&uvcg_default_color_matching_type); &uvcg_default_color_matching_type);
uvcg_init_group(&uvcg_color_matching_grp.group, config_group_init_type_name(&uvcg_color_matching_grp.group,
uvcg_color_matching_default_groups,
"color_matching", "color_matching",
&uvcg_color_matching_grp_type); &uvcg_color_matching_grp_type);
configfs_add_default_group(&uvcg_default_color_matching.group,
&uvcg_color_matching_grp.group);
config_group_init_type_name(&uvcg_streaming_class_fs.group, config_group_init_type_name(&uvcg_streaming_class_fs.group,
"fs", "fs", &uvcg_streaming_class_type);
&uvcg_streaming_class_type);
config_group_init_type_name(&uvcg_streaming_class_hs.group, config_group_init_type_name(&uvcg_streaming_class_hs.group,
"hs", "hs", &uvcg_streaming_class_type);
&uvcg_streaming_class_type);
config_group_init_type_name(&uvcg_streaming_class_ss.group, config_group_init_type_name(&uvcg_streaming_class_ss.group,
"ss", "ss", &uvcg_streaming_class_type);
&uvcg_streaming_class_type); config_group_init_type_name(&uvcg_streaming_class_grp.group,
uvcg_init_group(&uvcg_streaming_class_grp.group, "class", &uvcg_streaming_class_grp_type);
uvcg_streaming_class_default_groups, configfs_add_default_group(&uvcg_streaming_class_fs.group,
"class", &uvcg_streaming_class_grp.group);
&uvcg_streaming_class_grp_type); configfs_add_default_group(&uvcg_streaming_class_hs.group,
uvcg_init_group(&uvcg_streaming_grp.group, &uvcg_streaming_class_grp.group);
uvcg_streaming_default_groups, configfs_add_default_group(&uvcg_streaming_class_ss.group,
"streaming", &uvcg_streaming_class_grp.group);
&uvcg_streaming_grp_type);
uvcg_init_group(&opts->func_inst.group, config_group_init_type_name(&uvcg_streaming_grp.group,
uvcg_default_groups, "streaming", &uvcg_streaming_grp_type);
configfs_add_default_group(&uvcg_streaming_header_grp.group,
&uvcg_streaming_grp.group);
configfs_add_default_group(&uvcg_uncompressed_grp.group,
&uvcg_streaming_grp.group);
configfs_add_default_group(&uvcg_mjpeg_grp.group,
&uvcg_streaming_grp.group);
configfs_add_default_group(&uvcg_color_matching_grp.group,
&uvcg_streaming_grp.group);
configfs_add_default_group(&uvcg_streaming_class_grp.group,
&uvcg_streaming_grp.group);
config_group_init_type_name(&opts->func_inst.group,
"", "",
&uvc_func_type); &uvc_func_type);
configfs_add_default_group(&uvcg_control_grp.group,
&opts->func_inst.group);
configfs_add_default_group(&uvcg_streaming_grp.group,
&opts->func_inst.group);
return 0; return 0;
} }
...@@ -701,23 +701,29 @@ static int populate_groups(struct config_group *group) ...@@ -701,23 +701,29 @@ static int populate_groups(struct config_group *group)
{ {
struct config_group *new_group; struct config_group *new_group;
int ret = 0; int ret = 0;
int i;
if (group->default_groups) {
for (i = 0; group->default_groups[i]; i++) {
new_group = group->default_groups[i];
ret = create_default_group(group, new_group); list_for_each_entry(new_group, &group->default_groups, group_entry) {
if (ret) { ret = create_default_group(group, new_group);
detach_groups(group); if (ret) {
break; detach_groups(group);
} break;
} }
} }
return ret; return ret;
} }
void configfs_remove_default_groups(struct config_group *group)
{
struct config_group *g, *n;
list_for_each_entry_safe(g, n, &group->default_groups, group_entry) {
list_del(&g->group_entry);
config_item_put(&g->cg_item);
}
}
EXPORT_SYMBOL(configfs_remove_default_groups);
/* /*
* All of link_obj/unlink_obj/link_group/unlink_group require that * All of link_obj/unlink_obj/link_group/unlink_group require that
* subsys->su_mutex is held. * subsys->su_mutex is held.
...@@ -766,15 +772,10 @@ static void link_obj(struct config_item *parent_item, struct config_item *item) ...@@ -766,15 +772,10 @@ static void link_obj(struct config_item *parent_item, struct config_item *item)
static void unlink_group(struct config_group *group) static void unlink_group(struct config_group *group)
{ {
int i;
struct config_group *new_group; struct config_group *new_group;
if (group->default_groups) { list_for_each_entry(new_group, &group->default_groups, group_entry)
for (i = 0; group->default_groups[i]; i++) { unlink_group(new_group);
new_group = group->default_groups[i];
unlink_group(new_group);
}
}
group->cg_subsys = NULL; group->cg_subsys = NULL;
unlink_obj(&group->cg_item); unlink_obj(&group->cg_item);
...@@ -782,7 +783,6 @@ static void unlink_group(struct config_group *group) ...@@ -782,7 +783,6 @@ static void unlink_group(struct config_group *group)
static void link_group(struct config_group *parent_group, struct config_group *group) static void link_group(struct config_group *parent_group, struct config_group *group)
{ {
int i;
struct config_group *new_group; struct config_group *new_group;
struct configfs_subsystem *subsys = NULL; /* gcc is a turd */ struct configfs_subsystem *subsys = NULL; /* gcc is a turd */
...@@ -796,12 +796,8 @@ static void link_group(struct config_group *parent_group, struct config_group *g ...@@ -796,12 +796,8 @@ static void link_group(struct config_group *parent_group, struct config_group *g
BUG(); BUG();
group->cg_subsys = subsys; group->cg_subsys = subsys;
if (group->default_groups) { list_for_each_entry(new_group, &group->default_groups, group_entry)
for (i = 0; group->default_groups[i]; i++) { link_group(group, new_group);
new_group = group->default_groups[i];
link_group(group, new_group);
}
}
} }
/* /*
......
...@@ -75,7 +75,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr) ...@@ -75,7 +75,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
sd_iattr->ia_mode = sd->s_mode; sd_iattr->ia_mode = sd->s_mode;
sd_iattr->ia_uid = GLOBAL_ROOT_UID; sd_iattr->ia_uid = GLOBAL_ROOT_UID;
sd_iattr->ia_gid = GLOBAL_ROOT_GID; sd_iattr->ia_gid = GLOBAL_ROOT_GID;
sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME; sd_iattr->ia_atime = sd_iattr->ia_mtime =
sd_iattr->ia_ctime = current_fs_time(inode->i_sb);
sd->s_iattr = sd_iattr; sd->s_iattr = sd_iattr;
} }
/* attributes were changed atleast once in past */ /* attributes were changed atleast once in past */
...@@ -111,7 +112,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr) ...@@ -111,7 +112,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
static inline void set_default_inode_attr(struct inode * inode, umode_t mode) static inline void set_default_inode_attr(struct inode * inode, umode_t mode)
{ {
inode->i_mode = mode; inode->i_mode = mode;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_atime = inode->i_mtime =
inode->i_ctime = current_fs_time(inode->i_sb);
} }
static inline void set_inode_attr(struct inode * inode, struct iattr * iattr) static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
...@@ -195,7 +197,7 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in ...@@ -195,7 +197,7 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
return -ENOMEM; return -ENOMEM;
p_inode = d_inode(dentry->d_parent); p_inode = d_inode(dentry->d_parent);
p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME; p_inode->i_mtime = p_inode->i_ctime = current_fs_time(p_inode->i_sb);
configfs_set_inode_lock_class(sd, inode); configfs_set_inode_lock_class(sd, inode);
init(inode); init(inode);
......
...@@ -182,6 +182,7 @@ void config_group_init(struct config_group *group) ...@@ -182,6 +182,7 @@ void config_group_init(struct config_group *group)
{ {
config_item_init(&group->cg_item); config_item_init(&group->cg_item);
INIT_LIST_HEAD(&group->cg_children); INIT_LIST_HEAD(&group->cg_children);
INIT_LIST_HEAD(&group->default_groups);
} }
EXPORT_SYMBOL(config_group_init); EXPORT_SYMBOL(config_group_init);
......
...@@ -346,7 +346,6 @@ static struct config_group *make_cluster(struct config_group *g, ...@@ -346,7 +346,6 @@ static struct config_group *make_cluster(struct config_group *g,
void *gps = NULL; void *gps = NULL;
cl = kzalloc(sizeof(struct dlm_cluster), GFP_NOFS); cl = kzalloc(sizeof(struct dlm_cluster), GFP_NOFS);
gps = kcalloc(3, sizeof(struct config_group *), GFP_NOFS);
sps = kzalloc(sizeof(struct dlm_spaces), GFP_NOFS); sps = kzalloc(sizeof(struct dlm_spaces), GFP_NOFS);
cms = kzalloc(sizeof(struct dlm_comms), GFP_NOFS); cms = kzalloc(sizeof(struct dlm_comms), GFP_NOFS);
...@@ -357,10 +356,8 @@ static struct config_group *make_cluster(struct config_group *g, ...@@ -357,10 +356,8 @@ static struct config_group *make_cluster(struct config_group *g,
config_group_init_type_name(&sps->ss_group, "spaces", &spaces_type); config_group_init_type_name(&sps->ss_group, "spaces", &spaces_type);
config_group_init_type_name(&cms->cs_group, "comms", &comms_type); config_group_init_type_name(&cms->cs_group, "comms", &comms_type);
cl->group.default_groups = gps; configfs_add_default_group(&sps->ss_group, &cl->group);
cl->group.default_groups[0] = &sps->ss_group; configfs_add_default_group(&cms->cs_group, &cl->group);
cl->group.default_groups[1] = &cms->cs_group;
cl->group.default_groups[2] = NULL;
cl->cl_tcp_port = dlm_config.ci_tcp_port; cl->cl_tcp_port = dlm_config.ci_tcp_port;
cl->cl_buffer_size = dlm_config.ci_buffer_size; cl->cl_buffer_size = dlm_config.ci_buffer_size;
...@@ -383,7 +380,6 @@ static struct config_group *make_cluster(struct config_group *g, ...@@ -383,7 +380,6 @@ static struct config_group *make_cluster(struct config_group *g,
fail: fail:
kfree(cl); kfree(cl);
kfree(gps);
kfree(sps); kfree(sps);
kfree(cms); kfree(cms);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
...@@ -392,14 +388,8 @@ static struct config_group *make_cluster(struct config_group *g, ...@@ -392,14 +388,8 @@ static struct config_group *make_cluster(struct config_group *g,
static void drop_cluster(struct config_group *g, struct config_item *i) static void drop_cluster(struct config_group *g, struct config_item *i)
{ {
struct dlm_cluster *cl = config_item_to_cluster(i); struct dlm_cluster *cl = config_item_to_cluster(i);
struct config_item *tmp;
int j;
for (j = 0; cl->group.default_groups[j]; j++) { configfs_remove_default_groups(&cl->group);
tmp = &cl->group.default_groups[j]->cg_item;
cl->group.default_groups[j] = NULL;
config_item_put(tmp);
}
space_list = NULL; space_list = NULL;
comm_list = NULL; comm_list = NULL;
...@@ -410,7 +400,6 @@ static void drop_cluster(struct config_group *g, struct config_item *i) ...@@ -410,7 +400,6 @@ static void drop_cluster(struct config_group *g, struct config_item *i)
static void release_cluster(struct config_item *i) static void release_cluster(struct config_item *i)
{ {
struct dlm_cluster *cl = config_item_to_cluster(i); struct dlm_cluster *cl = config_item_to_cluster(i);
kfree(cl->group.default_groups);
kfree(cl); kfree(cl);
} }
...@@ -418,21 +407,17 @@ static struct config_group *make_space(struct config_group *g, const char *name) ...@@ -418,21 +407,17 @@ static struct config_group *make_space(struct config_group *g, const char *name)
{ {
struct dlm_space *sp = NULL; struct dlm_space *sp = NULL;
struct dlm_nodes *nds = NULL; struct dlm_nodes *nds = NULL;
void *gps = NULL;
sp = kzalloc(sizeof(struct dlm_space), GFP_NOFS); sp = kzalloc(sizeof(struct dlm_space), GFP_NOFS);
gps = kcalloc(2, sizeof(struct config_group *), GFP_NOFS);
nds = kzalloc(sizeof(struct dlm_nodes), GFP_NOFS); nds = kzalloc(sizeof(struct dlm_nodes), GFP_NOFS);
if (!sp || !gps || !nds) if (!sp || !nds)
goto fail; goto fail;
config_group_init_type_name(&sp->group, name, &space_type); config_group_init_type_name(&sp->group, name, &space_type);
config_group_init_type_name(&nds->ns_group, "nodes", &nodes_type);
sp->group.default_groups = gps; config_group_init_type_name(&nds->ns_group, "nodes", &nodes_type);
sp->group.default_groups[0] = &nds->ns_group; configfs_add_default_group(&nds->ns_group, &sp->group);
sp->group.default_groups[1] = NULL;
INIT_LIST_HEAD(&sp->members); INIT_LIST_HEAD(&sp->members);
mutex_init(&sp->members_lock); mutex_init(&sp->members_lock);
...@@ -441,7 +426,6 @@ static struct config_group *make_space(struct config_group *g, const char *name) ...@@ -441,7 +426,6 @@ static struct config_group *make_space(struct config_group *g, const char *name)
fail: fail:
kfree(sp); kfree(sp);
kfree(gps);
kfree(nds); kfree(nds);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
...@@ -449,24 +433,16 @@ static struct config_group *make_space(struct config_group *g, const char *name) ...@@ -449,24 +433,16 @@ static struct config_group *make_space(struct config_group *g, const char *name)
static void drop_space(struct config_group *g, struct config_item *i) static void drop_space(struct config_group *g, struct config_item *i)
{ {
struct dlm_space *sp = config_item_to_space(i); struct dlm_space *sp = config_item_to_space(i);
struct config_item *tmp;
int j;
/* assert list_empty(&sp->members) */ /* assert list_empty(&sp->members) */
for (j = 0; sp->group.default_groups[j]; j++) { configfs_remove_default_groups(&sp->group);
tmp = &sp->group.default_groups[j]->cg_item;
sp->group.default_groups[j] = NULL;
config_item_put(tmp);
}
config_item_put(i); config_item_put(i);
} }
static void release_space(struct config_item *i) static void release_space(struct config_item *i)
{ {
struct dlm_space *sp = config_item_to_space(i); struct dlm_space *sp = config_item_to_space(i);
kfree(sp->group.default_groups);
kfree(sp); kfree(sp);
} }
......
...@@ -630,7 +630,6 @@ static void o2nm_cluster_release(struct config_item *item) ...@@ -630,7 +630,6 @@ static void o2nm_cluster_release(struct config_item *item)
{ {
struct o2nm_cluster *cluster = to_o2nm_cluster(item); struct o2nm_cluster *cluster = to_o2nm_cluster(item);
kfree(cluster->cl_group.default_groups);
kfree(cluster); kfree(cluster);
} }
...@@ -666,7 +665,6 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g ...@@ -666,7 +665,6 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
struct o2nm_cluster *cluster = NULL; struct o2nm_cluster *cluster = NULL;
struct o2nm_node_group *ns = NULL; struct o2nm_node_group *ns = NULL;
struct config_group *o2hb_group = NULL, *ret = NULL; struct config_group *o2hb_group = NULL, *ret = NULL;
void *defs = NULL;
/* this runs under the parent dir's i_mutex; there can be only /* this runs under the parent dir's i_mutex; there can be only
* one caller in here at a time */ * one caller in here at a time */
...@@ -675,20 +673,18 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g ...@@ -675,20 +673,18 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL); cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL); ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
o2hb_group = o2hb_alloc_hb_set(); o2hb_group = o2hb_alloc_hb_set();
if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL) if (cluster == NULL || ns == NULL || o2hb_group == NULL)
goto out; goto out;
config_group_init_type_name(&cluster->cl_group, name, config_group_init_type_name(&cluster->cl_group, name,
&o2nm_cluster_type); &o2nm_cluster_type);
configfs_add_default_group(&ns->ns_group, &cluster->cl_group);
config_group_init_type_name(&ns->ns_group, "node", config_group_init_type_name(&ns->ns_group, "node",
&o2nm_node_group_type); &o2nm_node_group_type);
configfs_add_default_group(o2hb_group, &cluster->cl_group);
cluster->cl_group.default_groups = defs;
cluster->cl_group.default_groups[0] = &ns->ns_group;
cluster->cl_group.default_groups[1] = o2hb_group;
cluster->cl_group.default_groups[2] = NULL;
rwlock_init(&cluster->cl_nodes_lock); rwlock_init(&cluster->cl_nodes_lock);
cluster->cl_node_ip_tree = RB_ROOT; cluster->cl_node_ip_tree = RB_ROOT;
cluster->cl_reconnect_delay_ms = O2NET_RECONNECT_DELAY_MS_DEFAULT; cluster->cl_reconnect_delay_ms = O2NET_RECONNECT_DELAY_MS_DEFAULT;
...@@ -704,7 +700,6 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g ...@@ -704,7 +700,6 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
kfree(cluster); kfree(cluster);
kfree(ns); kfree(ns);
o2hb_free_hb_set(o2hb_group); o2hb_free_hb_set(o2hb_group);
kfree(defs);
ret = ERR_PTR(-ENOMEM); ret = ERR_PTR(-ENOMEM);
} }
...@@ -714,18 +709,11 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g ...@@ -714,18 +709,11 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
static void o2nm_cluster_group_drop_item(struct config_group *group, struct config_item *item) static void o2nm_cluster_group_drop_item(struct config_group *group, struct config_item *item)
{ {
struct o2nm_cluster *cluster = to_o2nm_cluster(item); struct o2nm_cluster *cluster = to_o2nm_cluster(item);
int i;
struct config_item *killme;
BUG_ON(o2nm_single_cluster != cluster); BUG_ON(o2nm_single_cluster != cluster);
o2nm_single_cluster = NULL; o2nm_single_cluster = NULL;
for (i = 0; cluster->cl_group.default_groups[i]; i++) { configfs_remove_default_groups(&cluster->cl_group);
killme = &cluster->cl_group.default_groups[i]->cg_item;
cluster->cl_group.default_groups[i] = NULL;
config_item_put(killme);
}
config_item_put(item); config_item_put(item);
} }
......
...@@ -96,7 +96,8 @@ struct config_group { ...@@ -96,7 +96,8 @@ struct config_group {
struct config_item cg_item; struct config_item cg_item;
struct list_head cg_children; struct list_head cg_children;
struct configfs_subsystem *cg_subsys; struct configfs_subsystem *cg_subsys;
struct config_group **default_groups; struct list_head default_groups;
struct list_head group_entry;
}; };
extern void config_group_init(struct config_group *group); extern void config_group_init(struct config_group *group);
...@@ -123,6 +124,12 @@ extern struct config_item *config_group_find_item(struct config_group *, ...@@ -123,6 +124,12 @@ extern struct config_item *config_group_find_item(struct config_group *,
const char *); const char *);
static inline void configfs_add_default_group(struct config_group *new_group,
struct config_group *group)
{
list_add_tail(&new_group->group_entry, &group->default_groups);
}
struct configfs_attribute { struct configfs_attribute {
const char *ca_name; const char *ca_name;
struct module *ca_owner; struct module *ca_owner;
...@@ -251,6 +258,8 @@ int configfs_register_group(struct config_group *parent_group, ...@@ -251,6 +258,8 @@ int configfs_register_group(struct config_group *parent_group,
struct config_group *group); struct config_group *group);
void configfs_unregister_group(struct config_group *group); void configfs_unregister_group(struct config_group *group);
void configfs_remove_default_groups(struct config_group *group);
struct config_group * struct config_group *
configfs_register_default_group(struct config_group *parent_group, configfs_register_default_group(struct config_group *parent_group,
const char *name, const char *name,
......
...@@ -560,7 +560,6 @@ struct se_node_acl { ...@@ -560,7 +560,6 @@ struct se_node_acl {
struct config_group acl_auth_group; struct config_group acl_auth_group;
struct config_group acl_param_group; struct config_group acl_param_group;
struct config_group acl_fabric_stat_group; struct config_group acl_fabric_stat_group;
struct config_group *acl_default_groups[5];
struct list_head acl_list; struct list_head acl_list;
struct list_head acl_sess_list; struct list_head acl_sess_list;
struct completion acl_free_comp; struct completion acl_free_comp;
...@@ -887,7 +886,6 @@ struct se_portal_group { ...@@ -887,7 +886,6 @@ struct se_portal_group {
const struct target_core_fabric_ops *se_tpg_tfo; const struct target_core_fabric_ops *se_tpg_tfo;
struct se_wwn *se_tpg_wwn; struct se_wwn *se_tpg_wwn;
struct config_group tpg_group; struct config_group tpg_group;
struct config_group *tpg_default_groups[7];
struct config_group tpg_lun_group; struct config_group tpg_lun_group;
struct config_group tpg_np_group; struct config_group tpg_np_group;
struct config_group tpg_acl_group; struct config_group tpg_acl_group;
...@@ -923,7 +921,6 @@ static inline struct se_portal_group *param_to_tpg(struct config_item *item) ...@@ -923,7 +921,6 @@ static inline struct se_portal_group *param_to_tpg(struct config_item *item)
struct se_wwn { struct se_wwn {
struct target_fabric_configfs *wwn_tf; struct target_fabric_configfs *wwn_tf;
struct config_group wwn_group; struct config_group wwn_group;
struct config_group *wwn_default_groups[2];
struct config_group fabric_stat_group; struct config_group fabric_stat_group;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment