[Ocfs2-commits] jlbec commits r2063 - in trunk/fs: ocfs2/cluster usysfs

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Fri Mar 25 20:23:53 CST 2005


Author: jlbec
Signed-off-by: manish
Date: 2005-03-25 20:23:52 -0600 (Fri, 25 Mar 2005)
New Revision: 2063

Modified:
   trunk/fs/ocfs2/cluster/heartbeat.c
   trunk/fs/ocfs2/cluster/nodemanager.c
   trunk/fs/usysfs/bobtest.c
   trunk/fs/usysfs/dir.c
   trunk/fs/usysfs/file.c
   trunk/fs/usysfs/uobject.h
   trunk/fs/usysfs/usysfs.h
Log:

o Change default_attrs to attrs
o Change sysfs_ops to attr_ops

Signed-off-by: manish



Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-03-26 02:23:52 UTC (rev 2063)
@@ -658,7 +658,7 @@
 	.store	= hb_region_dev_write,
 };
 
-static struct usysfs_attribute *hb_region_default_attrs[] = {
+static struct usysfs_attribute *hb_region_attrs[] = {
 	&hb_region_attr_block_bytes.attr,
 	&hb_region_attr_start_block.attr,
 	&hb_region_attr_blocks.attr,
@@ -694,7 +694,7 @@
 	return ret;
 }
 
-static struct usysfs_attribute_operations hb_region_sysfs_ops = {
+static struct usysfs_attribute_operations hb_region_attr_ops = {
 	.show	= &hb_region_show,
 	.store	= &hb_region_store,
 };
@@ -705,8 +705,8 @@
 
 static struct uobj_type hb_region_type = {
 	.object_ops	= &hb_region_object_ops,
-	.sysfs_ops	= &hb_region_sysfs_ops,
-	.default_attrs	= hb_region_default_attrs,
+	.attr_ops	= &hb_region_attr_ops,
+	.attrs		= hb_region_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -776,7 +776,7 @@
 
 struct uobj_type hb_heartbeat_set_type = {
 	.set_ops	= &hb_heartbeat_set_set_ops,
-	.sysfs_ops	= NULL, /* no attributes */
+	.attr_ops	= NULL, /* no attributes */
 	.owner		= THIS_MODULE,
 };
 

Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/ocfs2/cluster/nodemanager.c	2005-03-26 02:23:52 UTC (rev 2063)
@@ -401,7 +401,7 @@
 	.show	= nm_node_local_read,
 	.store	= nm_node_local_write,
 };
-static struct usysfs_attribute *nm_node_default_attrs[] = {
+static struct usysfs_attribute *nm_node_attrs[] = {
 	&nm_node_attr_num.attr,
 	&nm_node_attr_ipv4_port.attr,
 	&nm_node_attr_ipv4_address.attr,
@@ -437,7 +437,7 @@
 	return ret;
 }
 
-static struct usysfs_attribute_operations nm_node_sysfs_ops = {
+static struct usysfs_attribute_operations nm_node_attr_ops = {
 	.show	= &nm_node_show,
 	.store	= &nm_node_store,
 };
@@ -448,8 +448,8 @@
 
 static struct uobj_type nm_node_type = {
 	.object_ops	= &nm_node_object_ops,
-	.sysfs_ops	= &nm_node_sysfs_ops,
-	.default_attrs	= nm_node_default_attrs,
+	.attr_ops	= &nm_node_attr_ops,
+	.attrs		= nm_node_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -560,7 +560,7 @@
 
 static struct uobj_type nm_node_set_type = {
 	.set_ops	= &nm_node_set_set_ops,
-	.sysfs_ops	= NULL, /* no attributes */
+	.attr_ops	= NULL, /* no attributes */
 	.owner		= THIS_MODULE,
 };
 
@@ -582,7 +582,7 @@
 
 static struct uobj_type nm_cluster_type = {
 	.object_ops	= &nm_cluster_object_ops,
-	.sysfs_ops	= NULL, /* no attributes */
+	.attr_ops	= NULL, /* no attributes */
 	.owner	= THIS_MODULE,
 };
 
@@ -673,7 +673,7 @@
 
 static struct uobj_type nm_cluster_set_type = {
 	.set_ops	= &nm_cluster_set_set_ops,
-	.sysfs_ops	= NULL, /* no attributes */
+	.attr_ops	= NULL, /* no attributes */
 	.owner	= THIS_MODULE,
 };
 

Modified: trunk/fs/usysfs/bobtest.c
===================================================================
--- trunk/fs/usysfs/bobtest.c	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/usysfs/bobtest.c	2005-03-26 02:23:52 UTC (rev 2063)
@@ -84,7 +84,7 @@
 	return ret;
 }
 
-struct usysfs_attribute_operations robert_sysfs_ops = {
+struct usysfs_attribute_operations robert_attr_ops = {
 	.show	= &robert_attr_show,
 };
 
@@ -100,8 +100,8 @@
 
 static struct uobj_type uktype_robert = {
 	.object_ops	= &robert_object_ops,
-	.sysfs_ops	= &robert_sysfs_ops,
-	.default_attrs	= robert_attrs,
+	.attr_ops	= &robert_attr_ops,
+	.attrs		= robert_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -209,7 +209,7 @@
 	return ret;
 }
 
-struct usysfs_attribute_operations bob_sysfs_ops = {
+struct usysfs_attribute_operations bob_attr_ops = {
 	.show	= &bob_attr_show,
 	.store	= &bob_attr_store,
 };
@@ -226,8 +226,8 @@
 
 static struct uobj_type uktype_bob = {
 	.object_ops	= &bob_object_ops,
-	.sysfs_ops	= &bob_sysfs_ops,
-	.default_attrs	= bob_attrs,
+	.attr_ops	= &bob_attr_ops,
+	.attrs		= bob_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -263,7 +263,7 @@
 	return ret;
 }
 
-static struct usysfs_attribute_operations bobset_sysfs_ops = {
+static struct usysfs_attribute_operations bobset_attr_ops = {
 	.show	= &bobset_attr_show,
 };
 
@@ -324,8 +324,8 @@
 
 static struct uobj_type uktype_bobset = {
 	.set_ops	= &bobset_set_ops,
-	.sysfs_ops	= &bobset_sysfs_ops,
-	.default_attrs	= bobset_attrs,
+	.attr_ops	= &bobset_attr_ops,
+	.attrs		= bobset_attrs,
 };
 
 static struct bobset bobset = {
@@ -437,7 +437,7 @@
 	return ret;
 }
 
-struct usysfs_attribute_operations jerry_sysfs_ops = {
+struct usysfs_attribute_operations jerry_attr_ops = {
 	.show	= &jerry_attr_show,
 	.store	= &jerry_attr_store,
 };
@@ -465,8 +465,8 @@
 
 static struct uobj_type uktype_jerry = {
 	.object_ops	= &jerry_object_ops,
-	.sysfs_ops	= &jerry_sysfs_ops,
-	.default_attrs	= jerry_attrs,
+	.attr_ops	= &jerry_attr_ops,
+	.attrs		= jerry_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -565,7 +565,7 @@
 	return ret;
 }
 
-struct usysfs_attribute_operations tom_sysfs_ops = {
+struct usysfs_attribute_operations tom_attr_ops = {
 	.show	= &tom_attr_show,
 	.store	= &tom_attr_store,
 };
@@ -585,8 +585,8 @@
 
 static struct uobj_type uktype_tom = {
 	.object_ops	= &tom_object_ops,
-	.sysfs_ops	= &tom_sysfs_ops,
-	.default_attrs	= tom_attrs,
+	.attr_ops	= &tom_attr_ops,
+	.attrs		= tom_attrs,
 	.owner	= THIS_MODULE,
 };
 
@@ -622,7 +622,7 @@
 	return ret;
 }
 
-static struct usysfs_attribute_operations tomset_sysfs_ops = {
+static struct usysfs_attribute_operations tomset_attr_ops = {
 	.show	= &tomset_attr_show,
 };
 
@@ -704,8 +704,8 @@
 
 static struct uobj_type uktype_tomset = {
 	.set_ops	= &tomset_set_ops,
-	.sysfs_ops	= &tomset_sysfs_ops,
-	.default_attrs	= tomset_attrs,
+	.attr_ops	= &tomset_attr_ops,
+	.attrs		= tomset_attrs,
 };
 
 static struct tomset tomset = {

Modified: trunk/fs/usysfs/dir.c
===================================================================
--- trunk/fs/usysfs/dir.c	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/usysfs/dir.c	2005-03-26 02:23:52 UTC (rev 2063)
@@ -355,8 +355,8 @@
 
 	if (!t)
 		return -EINVAL;
-	if (t->default_attrs) {
-		for (i = 0; (attr = t->default_attrs[i]) != NULL; i++) {
+	if (t->attrs) {
+		for (i = 0; (attr = t->attrs[i]) != NULL; i++) {
 			if ((error = usysfs_create_file(uobj, attr)))
 				break;
 		}

Modified: trunk/fs/usysfs/file.c
===================================================================
--- trunk/fs/usysfs/file.c	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/usysfs/file.c	2005-03-26 02:23:52 UTC (rev 2063)
@@ -250,7 +250,7 @@
 	 * itself, and use ops for it.
 	 */
 	if (uobj->ktype)
-		ops = uobj->ktype->sysfs_ops;
+		ops = uobj->ktype->attr_ops;
 	else
 		goto Eaccess;
 

Modified: trunk/fs/usysfs/uobject.h
===================================================================
--- trunk/fs/usysfs/uobject.h	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/usysfs/uobject.h	2005-03-26 02:23:52 UTC (rev 2063)
@@ -73,8 +73,8 @@
 	struct module *owner;
 	struct usysfs_object_operations		*object_ops;
 	struct usysfs_set_operations		*set_ops;
-	struct usysfs_attribute_operations	*sysfs_ops;
-	struct usysfs_attribute			**default_attrs;
+	struct usysfs_attribute_operations	*attr_ops;
+	struct usysfs_attribute			**attrs;
 };
 
 
@@ -91,7 +91,10 @@
 
 
 extern void uset_init(struct uset *set);
+extern void uset_init_type_name(struct uset *uset, const char *name,
+				struct uobj_type *ktype);
 
+
 static inline struct uset *to_uset(struct uobject *uobj)
 {
 	return uobj ? container_of(uobj,struct uset,uobj) : NULL;

Modified: trunk/fs/usysfs/usysfs.h
===================================================================
--- trunk/fs/usysfs/usysfs.h	2005-03-26 02:10:28 UTC (rev 2062)
+++ trunk/fs/usysfs/usysfs.h	2005-03-26 02:23:52 UTC (rev 2063)
@@ -68,8 +68,6 @@
         void (*drop_object)(struct uset *uset, struct uobject *uobj);
 };
 
-void uset_init_type_name(struct uset *uset, const char *name,
-			 struct uobj_type *ktype);
 
 
 /**



More information about the Ocfs2-commits mailing list