Changeset 41202a9 in mainline

Timestamp:

2011-03-26T10:38:09Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7cb975e

Parents:

54caa41b

Message:

Lot of improvements to the MinixFS driver:

• Add mfs_node_put()
• Add mfs_node_open()
• Add mfs_index_get()
• Add mfs_lnkcnt_get()

Add the mfs_dentry.c file which I forgot to add before.

Location:

uspace/srv/fs/minixfs

Files:

• mfs.c (modified) (2 diffs)
• mfs.h (modified) (1 diff)
• mfs_dentry.c (added)
• mfs_ops.c (modified) (10 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -94 +94 @@
         
                 callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
+                int method = IPC_GET_IMETHOD(call);
+
+                mfsdebug(NAME "method = %d\n", method);
+                switch  (method) {
                 case IPC_M_PHONE_HUNGUP:
                         return;
@@ -108 +111 @@
                         break;
                 case VFS_OUT_LOOKUP:
+                        mfsdebug("lookup called\n");
                         mfs_lookup(callid, &call);
                         break;

uspace/srv/fs/minixfs/mfs.h

@@ -98 +98 @@
 
         bool dirty;
+        fs_index_t index;
 };
 

uspace/srv/fs/minixfs/mfs_ops.c

@@ -44 +44 @@
                         fs_index_t index);
 
+static int mfs_node_put(fs_node_t *fsnode);
+static int mfs_node_open(fs_node_t *fsnode);
+static fs_index_t mfs_index_get(fs_node_t *fsnode);
+static unsigned mfs_lnkcnt_get(fs_node_t *fsnode);
+
 static LIST_INITIALIZE(inst_list);
 static FIBRIL_MUTEX_INITIALIZE(inst_list_mutex);
@@ -54 +59 @@
         .is_file = mfs_is_file,
         .node_get = mfs_node_get,
+        .node_put = mfs_node_put,
+        .node_open = mfs_node_open,
+        .index_get = mfs_index_get,
         .plb_get_char = mfs_plb_get_char,
-        .has_children = mfs_has_children
+        .has_children = mfs_has_children,
+        .lnkcnt_get = mfs_lnkcnt_get
 };
 
@@ -221 +230 @@
         assert(mnode->ino_i);
 
+        mfsdebug("inode size is %d\n", (int) mnode->ino_i->i_size);
+
         return mnode->ino_i->i_size;
 }
@@ -236 +247 @@
         struct mfs_instance *instance;
 
+        mfsdebug("node_get called\n");
+
         rc = mfs_instance_get(devmap_handle, &instance);
 
@@ -242 +255 @@
 
         return mfs_node_core_get(rfn, instance, index);
+}
+
+static int mfs_node_put(fs_node_t *fsnode)
+{
+        struct mfs_node *mnode = fsnode->data;
+
+        mfsdebug("mfs_node_put()\n");
+
+        assert(mnode->ino_i);
+
+        if (mnode->ino_i->dirty) {
+                /*TODO: Write inode on disk*/
+        }
+
+        free(mnode->ino_i);
+        free(mnode);
+
+        return EOK;
+}
+
+static int mfs_node_open(fs_node_t *fsnode)
+{
+        mfsdebug("mfs_node_open()\n");
+        /*
+         * Opening a file is stateless, nothing
+         * to be done here.
+         */
+        return EOK;
+}
+
+static fs_index_t mfs_index_get(fs_node_t *fsnode)
+{
+        struct mfs_node *mnode = fsnode->data;
+
+        mfsdebug("mfs_index_get()\n");
+
+        assert(mnode->ino_i);
+        return mnode->ino_i->index;
+}
+
+static unsigned mfs_lnkcnt_get(fs_node_t *fsnode)
+{
+        unsigned rc;
+        struct mfs_node *mnode = fsnode->data;
+
+        assert(mnode);
+        assert(mnode->ino_i);
+
+        rc = mnode->ino_i->i_nlinks;
+        mfsdebug("mfs_lnkcnt_get(): %u\n", rc);
+        return rc;
 }
 
@@ -280 +344 @@
                 return -1;
 
+        ino_i->index = index;
         mnode->ino_i = ino_i;
 
@@ -285 +350 @@
         node->data = mnode;
         *rfn = node;
+
+        mfsdebug("node_get_core(%d) OK\n", (int) index);
 
         return EOK;
@@ -310 +377 @@
 int mfs_root_get(fs_node_t **rfn, devmap_handle_t handle)
 {
-        return mfs_node_get(rfn, handle, MFS_ROOT_INO);
+        int rc = mfs_node_get(rfn, handle, MFS_ROOT_INO);
+
+        mfsdebug("mfs_root_get %s\n", rc == EOK ? "OK" : "FAIL");
+        return rc;
 }
 
@@ -353 +423 @@
         }
 
+out:
+
         if (*has_children)
                 mfsdebug("Has children\n");
@@ -358 +430 @@
                 mfsdebug("Has not children\n");
 
-out:
         return EOK;
 }