Changeset 7b6d98b in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.c

Timestamp:

2008-03-05T22:11:57Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

739d00a

Parents:

3ca7059

Message:

No need to keep the parent pointer in the TMPFS node. Moreover, other file
systems won't have it either. Finally, if TMPFS is to support hardlinks, there
can be multiple parents.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -71 +71 @@
 static void *tmpfs_create_node(int);
 static bool tmpfs_link_node(void *, void *, const char *);
-static int tmpfs_unlink_node(void *);
+static int tmpfs_unlink_node(void *, void *);
 static void tmpfs_destroy_node(void *);
 
@@ -171 +171 @@
 {
         dentry->index = 0;
-        dentry->parent = NULL;
         dentry->sibling = NULL;
         dentry->child = NULL;
@@ -251 +250 @@
                 parentp->child = childp;
         }
-        childp->parent = parentp;
 
         return true;
 }
 
-int tmpfs_unlink_node(void *nodeptr)
-{
-        tmpfs_dentry_t *dentry = (tmpfs_dentry_t *)nodeptr;
-
-        if (dentry->child)
+int tmpfs_unlink_node(void *prnt, void *chld)
+{
+        tmpfs_dentry_t *parentp = (tmpfs_dentry_t *)prnt;
+        tmpfs_dentry_t *childp = (tmpfs_dentry_t *)chld;
+
+        if (!parentp)
+                return EBUSY;
+
+        if (childp->child)
                 return ENOTEMPTY;
 
-        if (!dentry->parent)
-                return EBUSY;
-
-        if (dentry->parent->child == dentry) {
-                dentry->parent->child = dentry->sibling;
+        if (parentp->child == childp) {
+                parentp->child = childp->sibling;
         } else {
                 /* TODO: consider doubly linked list for organizing siblings. */
-                tmpfs_dentry_t *tmp = dentry->parent->child;
-                while (tmp->sibling != dentry)
+                tmpfs_dentry_t *tmp = parentp->child;
+                while (tmp->sibling != childp)
                         tmp = tmp->sibling;
-                tmp->sibling = dentry->sibling;
-        }
-        dentry->sibling = NULL;
-        dentry->parent = NULL;
-
-        free(dentry->name);
-        dentry->name = NULL;
-
-        dentry->lnkcnt--;
+                tmp->sibling = childp->sibling;
+        }
+        childp->sibling = NULL;
+
+        free(childp->name);
+        childp->name = NULL;
+
+        childp->lnkcnt--;
 
         return EOK;