Changeset 16105cba in mainline

Timestamp:

2008-02-17T14:28:20Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e704503

Parents:

2616965d

Message:

Add TMPFS support for destroying leaf links in the file system namespace.

Location:

uspace

Files:

• lib/libc/include/errno.h (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)

uspace/lib/libc/include/errno.h

@@ -43 +43 @@
 #define ENOSPC          (-259)
 #define EEXIST          (-260)
+#define ENOTEMPTY       (-261)
 
 #endif

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -188 +188 @@
 static int destroy_component(void *nodeptr)
 {
-        return EPERM;
+        tmpfs_dentry_t *dentry = (tmpfs_dentry_t *)nodeptr;
+
+        if (dentry->child)
+                return ENOTEMPTY;
+
+        if (!dentry->parent)
+                return EBUSY;
+
+        if (dentry->parent->child == dentry) {
+                dentry->parent->child = dentry->sibling;
+        } else {
+                /* TODO: consider doubly linked list for organizing siblings. */
+                tmpfs_dentry_t *tmp = dentry->parent->child;
+                while (tmp->sibling != dentry)
+                        tmp = tmp->sibling;
+                tmp->sibling = dentry->sibling;
+        }
+
+        return EOK;
 }
 
@@ -314 +332 @@
         if (lflag & L_DESTROY) {
                 int res = destroy_component(dcur);
-                ipc_answer_0(rid, res);
+                unsigned lnkcnt = (res == EOK) ? 0 : TMPFS_GET_LNKCNT(dcur);
+                ipc_answer_5(rid, (ipcarg_t)res, tmpfs_reg.fs_handle,
+                    dev_handle, dcur->index, dcur->size, lnkcnt);
                 return;
         }