Changeset 10e4cd7 in mainline

Timestamp:

2011-11-03T21:45:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

76a67ce

Parents:

3ce78580

Message:

Initial implementation of vfs mtab_read support

Location:

uspace

Files:

• lib/c/generic/vfs/vfs.c (modified) (2 diffs)
• lib/c/include/ipc/vfs.h (modified) (2 diffs)
• lib/c/include/vfs/vfs.h (modified) (2 diffs)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -35 +35 @@
 #include <vfs/canonify.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_mtab.h>
 #include <vfs/vfs_sess.h>
 #include <macros.h>
@@ -831 +832 @@
 }
 
+int get_mtab_list(list_t *mtab_list)
+{
+        sysarg_t rc;
+        size_t i;
+        size_t num_mounted_fs;
+        
+        async_exch_t *exch = vfs_exchange_begin();
+
+        rc = async_req_0_0(exch, VFS_IN_GET_MTAB);
+        if (rc != EOK)
+                goto exit;
+
+        /* Ask VFS how many filesystems are mounted */
+        rc = async_req_0_1(exch, VFS_IN_PING, &num_mounted_fs);
+        if (rc != EOK)
+                goto exit;
+
+        for (i = 0; i < num_mounted_fs; ++i) {
+                mtab_list_ent_t *mtab_list_ent;
+                mtab_ent_t *mtab_ent;
+
+                mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
+                if (!mtab_list_ent) {
+                        rc = ENOMEM;
+                        goto exit;
+                }
+
+                mtab_ent = &mtab_list_ent->mtab_ent;
+
+                rc = async_data_read_start(exch, (void *) &mtab_ent->mp,
+                    MAX_PATH_LEN);
+                if (rc != EOK)
+                        goto exit;
+
+                rc = async_data_read_start(exch, (void *) &mtab_ent->opts,
+                        MAX_MNTOPTS_LEN);
+                if (rc != EOK)
+                        goto exit;
+
+                rc = async_data_read_start(exch, (void *) &mtab_ent->fs_name,
+                        FS_NAME_MAXLEN);
+                if (rc != EOK)
+                        goto exit;
+
+                sysarg_t p[3];
+                int j;
+
+                for (j = 0; j < 3; ++j) {
+                        rc = async_req_0_1(exch, VFS_IN_PING, &p[j]);
+                        if (rc != EOK)
+                                goto exit;
+                }
+
+                mtab_ent->flags = p[0];
+                mtab_ent->instance = p[1];
+                mtab_ent->fs_handle = p[2];
+
+                link_initialize(&mtab_list_ent->link);
+                list_append(&mtab_list_ent->link, mtab_list);
+        }
+
+exit:
+        vfs_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vfs.h

@@ -42 +42 @@
 #define FS_NAME_MAXLEN  20
 #define MAX_PATH_LEN    (64 * 1024)
+#define MAX_MNTOPTS_LEN 256
 #define PLB_SIZE        (2 * MAX_PATH_LEN)
 
@@ -80 +81 @@
         VFS_IN_DUP,
         VFS_IN_WAIT_HANDLE,
+        VFS_IN_GET_MTAB,
 } vfs_in_request_t;
 

uspace/lib/c/include/vfs/vfs.h

@@ -39 +39 @@
 #include <ipc/vfs.h>
 #include <ipc/loc.h>
+#include <adt/list.h>
 #include <stdio.h>
 #include <async.h>
@@ -55 +56 @@
 
 extern int fd_wait(void);
+extern int get_mtab_list(list_t *mtab_list);
 
 extern async_exch_t *vfs_exchange_begin(void);

uspace/srv/vfs/vfs.c

@@ -127 +127 @@
                         vfs_wait_handle(callid, &call);
                         break;
+                case VFS_IN_GET_MTAB:
+                        //vfs_get_mounted_fs_info(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/srv/vfs/vfs.h

@@ -150 +150 @@
 extern list_t fs_list;          /**< List of registered file systems. */
 
+extern fibril_mutex_t fs_mntlist_lock;
+extern list_t fs_mntlist;       /**< List of mounted file systems. */
+
 extern vfs_pair_t rootfs;       /**< Root file system. */
 
@@ -162 +165 @@
 extern uint8_t *plb;            /**< Path Lookup Buffer */
 extern list_t plb_entries;      /**< List of active PLB entries. */
-
-#define MAX_MNTOPTS_LEN         256
 
 /** Holding this rwlock prevents changes in file system namespace. */ 

uspace/srv/vfs/vfs_ops.c

@@ -52 +52 @@
 #include <assert.h>
 #include <vfs/canonify.h>
+#include <vfs/vfs_mtab.h>
+
+FIBRIL_MUTEX_INITIALIZE(mtab_list_lock);
+LIST_INITIALIZE(mtab_list);
+static size_t mtab_size = 0;
 
 /* Forward declarations of static functions. */
@@ -353 +358 @@
         fibril_mutex_unlock(&fs_list_lock);
         
+        /* Do the mount */
+        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+
+        /* Add the filesystem info to the list of mounted filesystems */
+        mtab_list_ent_t *mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
+        if (!mtab_list_ent) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
+                free(mp);
+                free(fs_name);
+                free(opts);
+                return;
+        }
+
+        mtab_ent_t *mtab_ent = &mtab_list_ent->mtab_ent;
+
+        mtab_ent->fs_handle = fs_handle;
+        str_cpy(mtab_ent->mp, MAX_PATH_LEN, mp);
+        str_cpy(mtab_ent->fs_name, FS_NAME_MAXLEN, fs_name);
+        str_cpy(mtab_ent->opts, MAX_MNTOPTS_LEN, opts);
+        mtab_ent->flags = flags;
+        mtab_ent->instance = instance;
+
+        link_initialize(&mtab_list_ent->link);
+
+        fibril_mutex_lock(&mtab_list_lock);
+        list_append(&mtab_list_ent->link, &mtab_list);
+        mtab_size++;
+        fibril_mutex_unlock(&mtab_list_lock);
+
+        free(mp);
+
         /* Acknowledge that we know fs_name. */
         async_answer_0(callid, EOK);
-        
-        /* Do the mount */
-        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
-        free(mp);
-        free(fs_name);
-        free(opts);
 }