Changeset 668f1949 in mainline

Timestamp:

2011-04-09T15:37:20Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

d0f3692

Parents:

e666ddc

Message:

• mfs_read partially implemented, only directories are supported (yet)
• minor code cleanup

Location:

uspace/srv/fs/minixfs

Files:

• mfs.c (modified) (2 diffs)
• mfs.h (modified) (2 diffs)
• mfs_ops.c (modified) (8 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -99 +99 @@
                         return;
                 case VFS_OUT_MOUNTED:
-                        mfsdebug("Mount request received\n");
                         mfs_mounted(callid, &call);
                         break;
@@ -109 +108 @@
                         break;
                 case VFS_OUT_LOOKUP:
-                        mfsdebug("lookup called\n");
                         mfs_lookup(callid, &call);
+                        break;
+                case VFS_OUT_READ:
+                        mfs_read(callid, &call);
                         break;
                 default:

uspace/srv/fs/minixfs/mfs.h

@@ -35 +35 @@
 
 #include <minix.h>
+#include <macros.h>
 #include <libblock.h>
 #include <libfs.h>
@@ -153 +154 @@
 extern void mfs_stat(ipc_callid_t rid, ipc_call_t *request);
 
+extern void
+mfs_read(ipc_callid_t rid, ipc_call_t *request);
+
+
 /*mfs_inode.c*/
 int

uspace/srv/fs/minixfs/mfs_ops.c

@@ -59 +59 @@
 static int mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name);
 
-static
-int mfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
+static int mfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
                         fs_index_t index);
 
@@ -381 +380 @@
         assert(mnode->ino_i);
 
-        mfsdebug("inode links = %d\n", (int) mnode->ino_i->i_nlinks);
-        mfsdebug("inode size is %d\n", (int) mnode->ino_i->i_size);
-
         return mnode->ino_i->i_size;
 }
@@ -399 +395 @@
         struct mfs_instance *instance;
 
-        mfsdebug("mfs_node_get()\n");
-
         rc = mfs_instance_get(devmap_handle, &instance);
 
@@ -412 +406 @@
 {
         struct mfs_node *mnode = fsnode->data;
-
-        mfsdebug("mfs_node_put()\n");
 
         put_inode(mnode);
@@ -435 +427 @@
         struct mfs_node *mnode = fsnode->data;
 
-        mfsdebug("mfs_index_get()\n");
-
         assert(mnode->ino_i);
         return mnode->ino_i->index;
@@ -450 +440 @@
 
         rc = mnode->ino_i->i_nlinks;
-        mfsdebug("mfs_lnkcnt_get(): %u\n", rc);
         return rc;
 }
@@ -515 +504 @@
 {
         int rc = mfs_node_get(rfn, handle, MFS_ROOT_INO);
-
-        mfsdebug("mfs_root_get %s\n", rc == EOK ? "OK" : "FAIL");
         return rc;
 }
@@ -577 +564 @@
 }
 
-/*
- * Find a filesystem instance given the devmap handle
- */
+void
+mfs_read(ipc_callid_t rid, ipc_call_t *request)
+{
+        int rc;
+        devmap_handle_t handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request),
+                                IPC_GET_ARG4(*request));
+        fs_node_t *fn;
+
+        rc = mfs_node_get(&fn, handle, index);
+        if (rc != EOK) {
+                async_answer_0(rid, rc);
+                return;
+        }
+        if (!fn) {
+                async_answer_0(rid, ENOENT);
+                return;
+        }
+
+        struct mfs_node *mnode;
+        struct mfs_ino_info *ino_i;
+        size_t len, bytes = 0;
+        ipc_callid_t callid;
+
+        mnode = fn->data;
+        ino_i = mnode->ino_i;
+
+        if (!async_data_read_receive(&callid, &len)) {
+                mfs_node_put(fn);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        if (S_ISDIR(ino_i->i_mode)) {
+                aoff64_t spos = pos;
+                struct mfs_dentry_info *d_info;
+
+                while (1) {
+                        d_info = read_directory_entry(mnode, pos);
+                        if (!d_info) {
+                                /*Reached the end of the dentries list*/
+                                break;
+                        }
+
+                        if (d_info->d_inum) {
+                                /*Dentry found!*/
+                                mfsdebug("DENTRY FOUND %s!!\n", d_info->d_name);
+                                goto found;
+                        }
+
+                        free(d_info);
+                        pos++;
+                }
+
+                rc = mfs_node_put(fn);
+                async_answer_0(callid, rc != EOK ? rc : ENOENT);
+                async_answer_1(rid, rc != EOK ? rc : ENOENT, 0);
+                return;
+found:
+                async_data_read_finalize(callid, d_info->d_name,
+                                str_size(d_info->d_name) + 1);
+                bytes = ((pos - spos) + 1);
+        }
+
+        rc = mfs_node_put(fn);
+        async_answer_1(rid, rc, (sysarg_t)bytes);
+}
+
 int mfs_instance_get(devmap_handle_t handle, struct mfs_instance **instance)
 {