[Ocfs2-commits] jlbec commits r2091 - in trunk/fs: configfs ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: jlbec
Signed-off-by: manish
Date: 2005-03-30 18:23:25 -0600 (Wed, 30 Mar 2005)
New Revision: 2091

Modified:
   trunk/fs/configfs/bobtest.c
   trunk/fs/configfs/configfs.h
   trunk/fs/configfs/item.c
   trunk/fs/configfs/mount.c
   trunk/fs/ocfs2/cluster/heartbeat.c
   trunk/fs/ocfs2/cluster/nodemanager.c
Log:

o Move config_group_init_type_name() to item.c
o Add config_item_init_type_name() to match.
o Update callers to use config_item_init_type_name().

Signed-off-by: manish



Modified: trunk/fs/configfs/bobtest.c
===================================================================
--- trunk/fs/configfs/bobtest.c	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/configfs/bobtest.c	2005-03-31 00:23:25 UTC (rev 2091)
@@ -286,9 +286,7 @@
 
 	memset(bob, 0, sizeof(struct bob));
 
-	config_item_set_name(&bob->item, name);
-	bob->item.ktype = &uktype_bob;
-	config_item_init(&bob->item);
+	config_item_init_type_name(&bob->item, name, &uktype_bob);
 
 	bob->showme = 0;
 	bob->storeme = 0;
@@ -652,17 +650,13 @@
 
 	memset(jerry, 0, sizeof(struct jerry));
 
-	config_item_set_name(&tom->group.cg_item, name);
-	tom->group.cg_item.ktype = &uktype_tom;
-	config_group_init(&tom->group);
+	config_group_init_type_name(&tom->group, name, &uktype_tom);
 
 	tom->showme = 0;
 	tom->storeme = 0;
 	tomset->n_toms++;
 
-	config_item_set_name(&jerry->group.cg_item, "jer");
-	jerry->group.cg_item.ktype = &uktype_jerry;
-	config_group_init(&jerry->group);
+	config_group_init_type_name(&jerry->group, "jer", &uktype_jerry);
 
 	tom->group.default_groups[0] = &jerry->group;
 	tom->group.default_groups[1] = NULL;

Modified: trunk/fs/configfs/configfs.h
===================================================================
--- trunk/fs/configfs/configfs.h	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/configfs/configfs.h	2005-03-31 00:23:25 UTC (rev 2091)
@@ -72,6 +72,9 @@
 }
 
 extern void config_item_init(struct config_item *);
+extern void config_item_init_type_name(struct config_item *item,
+				       const char *name,
+				       struct config_item_type *ktype);
 extern void config_item_cleanup(struct config_item *);
 
 extern struct config_item * config_item_get(struct config_item *);
@@ -99,8 +102,9 @@
 
 
 extern void config_group_init(struct config_group *group);
-extern void config_group_init_type_name(struct config_group *group, const char *name,
-				struct config_item_type *ktype);
+extern void config_group_init_type_name(struct config_group *group,
+					const char *name,
+					struct config_item_type *ktype);
 
 
 static inline struct config_group *to_config_group(struct config_item *item)

Modified: trunk/fs/configfs/item.c
===================================================================
--- trunk/fs/configfs/item.c	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/configfs/item.c	2005-03-31 00:23:25 UTC (rev 2091)
@@ -113,6 +113,25 @@
 
 EXPORT_SYMBOL(config_item_set_name);
 
+void config_item_init_type_name(struct config_item *item,
+				const char *name,
+				struct config_item_type *ktype)
+{
+	config_item_set_name(item, name);
+	item->ktype = ktype;
+	config_item_init(item);
+}
+EXPORT_SYMBOL(config_item_init_type_name);
+
+void config_group_init_type_name(struct config_group *group, const char *name,
+			 struct config_item_type *ktype)
+{
+	config_item_set_name(&group->cg_item, name);
+	group->cg_item.ktype = ktype;
+	config_group_init(group);
+}
+EXPORT_SYMBOL(config_group_init_type_name);
+
 struct config_item * config_item_get(struct config_item * item)
 {
 	if (item)

Modified: trunk/fs/configfs/mount.c
===================================================================
--- trunk/fs/configfs/mount.c	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/configfs/mount.c	2005-03-31 00:23:25 UTC (rev 2091)
@@ -70,15 +70,6 @@
 	.s_type		= CONFIGFS_ROOT,
 };
 
-void config_group_init_type_name(struct config_group *group, const char *name,
-			 struct config_item_type *ktype)
-{
-	config_item_set_name(&group->cg_item, name);
-	group->cg_item.ktype = ktype;
-	config_group_init(group);
-}
-EXPORT_SYMBOL(config_group_init_type_name);
-
 static int configfs_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct inode *inode;

Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-03-31 00:23:25 UTC (rev 2091)
@@ -734,9 +734,7 @@
 	rwlock_init(&reg->hr_slot_list_lock);
 	INIT_LIST_HEAD(&reg->hr_live_list);
 
-	config_item_set_name(&reg->hr_item, name);
-	reg->hr_item.ktype = &hb_region_type;
-	config_item_init(&reg->hr_item);
+	config_item_init_type_name(&reg->hr_item, name, &hb_region_type);
 
 	ret = &reg->hr_item;
 out:

Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c	2005-03-31 00:07:20 UTC (rev 2090)
+++ trunk/fs/ocfs2/cluster/nodemanager.c	2005-03-31 00:23:25 UTC (rev 2091)
@@ -536,9 +536,7 @@
 		goto out; /* ENOMEM */
 	}
 
-	config_item_set_name(&node->nd_item, name);
-	node->nd_item.ktype = &nm_node_type;
-	config_item_init(&node->nd_item);
+	config_item_init_type_name(&node->nd_item, name, &nm_node_type);
 
 	ret = &node->nd_item;