dlm: choose better identifiers
David Teigland
maintainerPATCH 6/6 dlm: choose better identifiers
From: Andrew Morton <[email protected]>
sparc32:
fs/dlm/config.c:397: error: expected identifier or '(' before '{' token fs/dlm/config.c: In function 'drop_node':fs/dlm/config.c:589: warning: initialization from incompatible pointer type fs/dlm/config.c:589: warning: initialization from incompatible pointer type fs/dlm/config.c: In function 'release_node':fs/dlm/config.c:601: warning: initialization from incompatible pointer type fs/dlm/config.c:601: warning: initialization from incompatible pointer type fs/dlm/config.c: In function 'show_node':fs/dlm/config.c:717: warning: initialization from incompatible pointer type fs/dlm/config.c:717: warning: initialization from incompatible pointer type fs/dlm/config.c: In function 'store_node':fs/dlm/config.c:726: warning: initialization from incompatible pointer type fs/dlm/config.c:726: warning: initialization from incompatible pointer type
--- fs/dlm/config.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-)
fs/dlm/config.c +22 -22
@@ -380,24 +380,24 @@ static struct config_item_type node_type = { .ct_owner = THIS_MODULE, }; -static struct dlm_cluster *to_cluster (struct config_item *i) +static struct dlm_cluster *config_item_to_cluster (struct config_item *i) { return i ? container_of(to_config_group(i), struct dlm_cluster, group) :NULL ; } -static struct dlm_space *to_space (struct config_item *i) +static struct dlm_space *config_item_to_space (struct config_item *i) { return i ? container_of(to_config_group(i), struct dlm_space, group) :NULL ; } -static struct dlm_comm *to_comm (struct config_item *i) +static struct dlm_comm *config_item_to_comm (struct config_item *i) { return i ? container_of(i, struct dlm_comm, item) : NULL; } -static struct dlm_node *to_node (struct config_item *i) +static struct dlm_node *config_item_to_node (struct config_item *i) { return i ? container_of(i, struct dlm_node, item) : NULL; }
@@ -453,7 +453,7 @@ static struct config_group *make_cluster(struct config_group *g,static void drop_cluster (struct config_group *g,struct config_item *i) { -struct dlm_cluster *cl =to_cluster (i); +struct dlm_cluster *cl =config_item_to_cluster (i);struct config_item *tmp;int j;
@@ -471,7 +471,7 @@ static void drop_cluster(struct config_group *g, struct config_item *i)static void release_cluster (struct config_item *i) { -struct dlm_cluster *cl =to_cluster (i); +struct dlm_cluster *cl =config_item_to_cluster (i);kfree (cl->group.default_groups);kfree (cl); }
@@ -510,7 +510,7 @@ 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) { -struct dlm_space *sp =to_space (i); +struct dlm_space *sp =config_item_to_space (i);struct config_item *tmp;int j;
@@ -527,7 +527,7 @@ static void drop_space(struct config_group *g, struct config_item *i)static void release_space (struct config_item *i) { -struct dlm_space *sp =to_space (i); +struct dlm_space *sp =config_item_to_space (i);kfree (sp->group.default_groups);kfree (sp); }
@@ -549,7 +549,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name)static void drop_comm (struct config_group *g,struct config_item *i) { -struct dlm_comm *cm =to_comm (i); +struct dlm_comm *cm =config_item_to_comm (i);if (local_comm == cm) local_comm =NULL ;dlm_lowcomms_close (cm->nodeid);
@@ -560,13 +560,13 @@ static void drop_comm(struct config_group *g, struct config_item *i)static void release_comm (struct config_item *i) { -struct dlm_comm *cm =to_comm (i); +struct dlm_comm *cm =config_item_to_comm (i);kfree (cm); }static struct config_item *make_node (struct config_group *g,const char *name) { -struct dlm_space *sp =to_space (g->cg_item.ci_parent); +struct dlm_space *sp =config_item_to_space (g->cg_item.ci_parent);struct dlm_node *nd; nd =kzalloc (sizeof (struct dlm_node ),GFP_KERNEL );
@@ -588,8 +588,8 @@ static struct config_item *make_node(struct config_group *g, const char *name)static void drop_node (struct config_group *g,struct config_item *i) { -struct dlm_space *sp =to_space (g->cg_item.ci_parent); -struct dlm_node *nd =to_node (i); +struct dlm_space *sp =config_item_to_space (g->cg_item.ci_parent); +struct dlm_node *nd =config_item_to_node (i);mutex_lock (&sp->members_lock);list_del (&nd->list);
@@ -601,7 +601,7 @@ static void drop_node(struct config_group *g, struct config_item *i)static void release_node (struct config_item *i) { -struct dlm_node *nd =to_node (i); +struct dlm_node *nd =config_item_to_node (i);kfree (nd); }
@@ -635,7 +635,7 @@ void dlm_config_exit(void)static ssize_t show_cluster (struct config_item *i,struct configfs_attribute *a,char *buf) { -struct dlm_cluster *cl =to_cluster (i); +struct dlm_cluster *cl =config_item_to_cluster (i);struct cluster_attribute *cla = container_of(a, struct cluster_attribute, attr);return cla->show ? cla->show (cl, buf) :0 ;
@@ -645,7 +645,7 @@ static ssize_t store_cluster(struct config_item *i,struct configfs_attribute *a, const char *buf, size_t len) { - struct dlm_cluster *cl = to_cluster(i); + struct dlm_cluster *cl = config_item_to_cluster(i);struct cluster_attribute *cla = container_of(a, struct cluster_attribute, attr);return cla->store ? cla->store (cl, buf, len) : -EINVAL ;
@@ -654,7 +654,7 @@ static ssize_t store_cluster(struct config_item *i,static ssize_t show_comm (struct config_item *i,struct configfs_attribute *a,char *buf) { -struct dlm_comm *cm =to_comm (i); +struct dlm_comm *cm =config_item_to_comm (i);struct comm_attribute *cma = container_of(a, struct comm_attribute, attr);return cma->show ? cma->show (cm, buf) :0 ;
@@ -663,7 +663,7 @@ static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a,static ssize_t store_comm (struct config_item *i,struct configfs_attribute *a,const char *buf,size_t len) { -struct dlm_comm *cm =to_comm (i); +struct dlm_comm *cm =config_item_to_comm (i);struct comm_attribute *cma = container_of(a, struct comm_attribute, attr);return cma->store ? cma->store (cm, buf, len) : -EINVAL ;
@@ -717,7 +717,7 @@ static ssize_t comm_addr_write(struct dlm_comm *cm, const char *buf, size_t len)static ssize_t show_node (struct config_item *i,struct configfs_attribute *a,char *buf) { -struct dlm_node *nd =to_node (i); +struct dlm_node *nd =config_item_to_node (i);struct node_attribute *nda = container_of(a, struct node_attribute, attr);return nda->show ? nda->show (nd, buf) :0 ;
@@ -726,7 +726,7 @@ static ssize_t show_node(struct config_item *i, struct configfs_attribute *a,static ssize_t store_node (struct config_item *i,struct configfs_attribute *a,const char *buf,size_t len) { -struct dlm_node *nd =to_node (i); +struct dlm_node *nd =config_item_to_node (i);struct node_attribute *nda = container_of(a, struct node_attribute, attr);return nda->store ? nda->store (nd, buf, len) : -EINVAL ;
@@ -771,7 +771,7 @@ static struct dlm_space *get_space(char *name) i =config_group_find_item (space_list, name);mutex_unlock (&space_list->cg_subsys->su_mutex); -return to_space (i); +return config_item_to_space (i); }static void put_space (struct dlm_space *sp)
@@ -818,7 +818,7 @@ static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr)mutex_lock (&clusters_root.subsys.su_mutex);list_for_each_entry (i, &comm_list->cg_children, ci_entry) { - cm =to_comm (i); + cm =config_item_to_comm (i);if (nodeid) {if (cm->nodeid != nodeid)
Signature · 1 line
1.5.5.1