Changeset d8af1bd in mainline

Timestamp:

2011-06-25T11:36:18Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

38b7233

Parents:

53eb588

Message:

Minixfs file deletion feature is complete but not yet stable.

Location:

uspace/srv/fs/minixfs

Files:

• mfs.c (modified) (1 diff)
• mfs.h (modified) (1 diff)
• mfs_ops.c (modified) (3 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -124 +124 @@
                         mfs_truncate(callid, &call);
                         break;
+                case VFS_OUT_DESTROY:
+                        mfs_destroy(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/srv/fs/minixfs/mfs.h

@@ -174 +174 @@
 mfs_truncate(ipc_callid_t rid, ipc_call_t *request);
 
+extern void
+mfs_destroy(ipc_callid_t rid, ipc_call_t *request);
+
 /*mfs_inode.c*/
 extern int

uspace/srv/fs/minixfs/mfs_ops.c

@@ -57 +57 @@
 static int mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name);
 static int mfs_unlink(fs_node_t *, fs_node_t *, const char *name);
+static int mfs_destroy_node(fs_node_t *fn);
 
 static int mfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
@@ -79 +80 @@
         .link = mfs_link,
         .unlink = mfs_unlink,
+        .destroy = mfs_destroy_node,
         .plb_get_char = mfs_plb_get_char,
         .has_children = mfs_has_children,
@@ -819 +821 @@
 
 void
+mfs_destroy(ipc_callid_t rid, ipc_call_t *request)
+{
+        devmap_handle_t handle = (devmap_handle_t)IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
+        fs_node_t *fn;
+        int r;
+
+        r = mfs_node_get(&fn, handle, index);
+        if (r != EOK) {
+                async_answer_0(rid, r);
+                return;
+        }
+        if (!fn) {
+                async_answer_0(rid, ENOENT);
+                return;
+        }
+
+        /*Destroy the inode*/
+        r = mfs_destroy_node(fn);
+        async_answer_0(rid, r);
+}
+
+static int
+mfs_destroy_node(fs_node_t *fn)
+{
+        struct mfs_node *mnode = fn->data;
+        bool has_children;
+        int r;
+
+        r = mfs_has_children(&has_children, fn);
+        on_error(r, return r);
+
+        assert(!has_children);
+
+        /*Free the entire inode content*/
+        r = inode_shrink(mnode, mnode->ino_i->i_size);
+        on_error(r, return r);
+        r = mfs_free_bit(mnode->instance, mnode->ino_i->index, BMAP_INODE);
+        on_error(r, return r);
+
+        free(mnode->ino_i);
+        free(mnode);
+        return r;
+}
+
+void
 mfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 {