Changeset 53eb588 in mainline

Timestamp:

2011-06-23T18:34:19Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

d8af1bd

Parents:

c955be91

Message:

Add the mfs_unlink() function

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -56 +56 @@
 static int mfs_create_node(fs_node_t **rfn, devmap_handle_t handle, int flags);
 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_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
@@ -77 +78 @@
         .create = mfs_create_node,
         .link = mfs_link,
+        .unlink = mfs_unlink,
         .plb_get_char = mfs_plb_get_char,
         .has_children = mfs_has_children,
@@ -433 +435 @@
 static unsigned mfs_lnkcnt_get(fs_node_t *fsnode)
 {
-        unsigned rc;
         struct mfs_node *mnode = fsnode->data;
 
@@ -439 +440 @@
         assert(mnode->ino_i);
 
-        rc = mnode->ino_i->i_nlinks;
-        return rc;
+        return mnode->ino_i->i_nlinks;;
 }
 
@@ -536 +536 @@
 exit_error:
         return r;
+}
+
+static int
+mfs_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *name)
+{
+        struct mfs_node *parent = pfn->data;
+        struct mfs_node *child = cfn->data;
+        bool has_children;
+        int r;
+
+        if (!parent)
+                return EBUSY;
+
+        r = mfs_has_children(&has_children, cfn);
+        on_error(r, return r);
+        if (has_children)
+                return ENOTEMPTY;
+
+        r = remove_dentry(parent, name);
+        on_error(r, return r);
+
+        struct mfs_ino_info *chino = child->ino_i;
+
+        assert(chino->i_nlinks >= 1);
+        --chino->i_nlinks;
+
+        chino->dirty = true;
+
+        return EOK;
 }