[Ocfs2-commits] jlbec commits r1991 - in branches/usysfsify/fs:
ocfs2/cluster usysfs
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Mar 16 20:26:55 CST 2005
Author: jlbec
Date: 2005-03-16 20:26:53 -0600 (Wed, 16 Mar 2005)
New Revision: 1991
Modified:
branches/usysfsify/fs/ocfs2/cluster/nodemanager.c
branches/usysfsify/fs/ocfs2/cluster/nodemanager.h
branches/usysfsify/fs/usysfs/dir.c
Log:
o trivial comment changes
Modified: branches/usysfsify/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- branches/usysfsify/fs/ocfs2/cluster/nodemanager.c 2005-03-17 02:16:17 UTC (rev 1990)
+++ branches/usysfsify/fs/ocfs2/cluster/nodemanager.c 2005-03-17 02:26:53 UTC (rev 1991)
@@ -207,7 +207,8 @@
struct nm_cluster *to_nm_cluster_from_node(struct nm_node *node)
{
- /* through the first node_set .parent */
+ /* through the first node_set .parent
+ * mycluster/nodes/mynode == nm_cluster->nm_node_set->nm_node */
return to_nm_cluster(node->nd_kobj.parent->parent);
}
Modified: branches/usysfsify/fs/ocfs2/cluster/nodemanager.h
===================================================================
--- branches/usysfsify/fs/ocfs2/cluster/nodemanager.h 2005-03-17 02:16:17 UTC (rev 1990)
+++ branches/usysfsify/fs/ocfs2/cluster/nodemanager.h 2005-03-17 02:26:53 UTC (rev 1991)
@@ -71,9 +71,6 @@
void (*orig_data_ready)(struct sock *sk, int bytes);
} net_inode_private;
-/* XXX this is now different from the userspace stuff, but that's ok,
- * because they're not used by an ioctl interface anymore. userspace
- * should move to something more natural. */
struct nm_node {
struct kobject nd_kobj;
char nd_name[NM_MAX_NAME_LEN+1]; /* replace? */
Modified: branches/usysfsify/fs/usysfs/dir.c
===================================================================
--- branches/usysfsify/fs/usysfs/dir.c 2005-03-17 02:16:17 UTC (rev 1990)
+++ branches/usysfsify/fs/usysfs/dir.c 2005-03-17 02:26:53 UTC (rev 1991)
@@ -385,6 +385,7 @@
continue;
list_del_init(&sd->s_sibling);
child = sd->s_dentry;
+ /* And now we're faking rmdir. Viro must hate me */
down(&child->d_inode->i_sem);
usysfs_drop_set(sd->s_element);
child->d_inode->i_flags |= S_DEAD;
@@ -449,6 +450,7 @@
int i;
if (ukset && ukset->default_sets) {
+ /* FYI, we're faking mkdir here */
down(&dentry->d_inode->i_sem);
for (i = 0; ukset->default_sets[i]; i++) {
More information about the Ocfs2-commits
mailing list