Changeset 7b6d98b in mainline

Timestamp:

2008-03-05T22:11:57Z (16 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.

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (3 diffs)
• lib/libfs/libfs.h (modified) (1 diff)
• srv/fs/tmpfs/tmpfs.h (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/lib/libfs/libfs.c

@@ -146 +146 @@
                 last += PLB_SIZE;
 
+        void *par = NULL;
         void *cur = ops->root_get();
         void *tmp = ops->child_get(cur);
@@ -207 +208 @@
 
                 /* descend one level */
+                par = cur;
                 cur = tmp;
                 tmp = ops->child_get(tmp);
@@ -261 +263 @@
         if (lflag & L_DESTROY) {
                 unsigned old_lnkcnt = ops->lnkcnt_get(cur);
-                int res = ops->unlink(cur);
+                int res = ops->unlink(par, cur);
                 ipc_answer_5(rid, (ipcarg_t)res, fs_handle, dev_handle,
                     ops->index_get(cur), ops->size_get(cur), old_lnkcnt);

uspace/lib/libfs/libfs.h

@@ -47 +47 @@
         void (* destroy)(void *);
         bool (* link)(void *, void *, const char *);
-        int (* unlink)(void *);
+        int (* unlink)(void *, void *);
         unsigned long (* index_get)(void *);
         unsigned long (* size_get)(void *);

uspace/srv/fs/tmpfs/tmpfs.h

@@ -46 +46 @@
         unsigned long index;    /**< TMPFS node index. */
         link_t dh_link;         /**< Dentries hash table link. */
-        struct tmpfs_dentry *parent;
         struct tmpfs_dentry *sibling;
         struct tmpfs_dentry *child;

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;