Changeset 4f100f4 in mainline

Timestamp:

2011-11-06T16:58:23Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

41047bf

Parents:

3ce78580 (diff), 460514d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for listing mounted file systems.

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• lib/c/generic/vfs/vfs.c (modified) (1 diff)
• lib/c/include/ipc/vfs.h (modified) (2 diffs)
• lib/c/include/vfs/vfs.h (modified) (2 diffs)
• lib/c/include/vfs/vfs_mtab.h (added)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (3 diffs)
• srv/vfs/vfs_ops.c (modified) (20 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
+#include <adt/list.h>
 #include <errno.h>
 #include <getopt.h>
@@ -60 +61 @@
         }
         return;
+}
+
+static void print_mtab_list(void)
+{
+        LIST_INITIALIZE(mtab_list);
+        get_mtab_list(&mtab_list);
+
+        mtab_ent_t *old_ent = NULL;
+
+        list_foreach(mtab_list, cur) {
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
+                    link);
+
+                if (old_ent)
+                        free(old_ent);
+
+                old_ent = mtab_ent;
+
+                printf("%s on %s ", mtab_ent->fs_name, mtab_ent->mp);
+
+                if (str_size(mtab_ent->opts) > 0)
+                        printf("opts=%s ", mtab_ent->opts);
+
+                printf("(instance=%d, service_id=%" PRIu64 ")\n",
+                    mtab_ent->instance, mtab_ent->service_id);
+        }
+
+        if (old_ent)
+                free(old_ent);
 }
 
@@ -94 +124 @@
                 t_argv = &argv[0];
 
-        if ((argc < 3) || (argc > 5)) {
+        if ((argc == 2) || (argc > 5)) {
                 printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;
+        }
+        if (argc == 1) {
+                print_mtab_list();
+                return CMD_SUCCESS;
         }
         if (argc > 3)

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

@@ -831 +831 @@
 }
 
+int get_mtab_list(list_t *mtab_list)
+{
+        sysarg_t rc;
+        aid_t req;
+        size_t i;
+        sysarg_t num_mounted_fs;
+        
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_0(exch, VFS_IN_MTAB_GET, NULL);
+
+        /* 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_ent_t *mtab_ent;
+
+                mtab_ent = malloc(sizeof(mtab_ent_t));
+                if (!mtab_ent) {
+                        rc = ENOMEM;
+                        goto exit;
+                }
+
+                memset(mtab_ent, 0, sizeof(mtab_ent_t));
+
+                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[2];
+
+                rc = async_req_0_2(exch, VFS_IN_PING, &p[0], &p[1]);
+                if (rc != EOK)
+                        goto exit;
+
+                mtab_ent->instance = p[0];
+                mtab_ent->service_id = p[1];
+
+                link_initialize(&mtab_ent->link);
+                list_append(&mtab_ent->link, mtab_list);
+        }
+
+exit:
+        async_wait_for(req, &rc);
+        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_MTAB_GET,
 } 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>
+#include "vfs_mtab.h"
 
 enum vfs_change_state_type {
@@ -55 +57 @@
 
 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_MTAB_GET:
+                        vfs_get_mtab(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. */ 
@@ -219 +220 @@
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
+extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *);
 
 #endif

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. */
@@ -68 +73 @@
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
+static int vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
     fs_handle_t fs_handle, char *mp, char *opts)
 {
@@ -91 +96 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, EBUSY);
-                        return;
+                        return EBUSY;
                 }
                 
@@ -99 +104 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, rc);
-                        return;
+                        return rc;
                 }
                 
@@ -106 +111 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, ENOMEM);
-                        return;
+                        return ENOMEM;
                 }
                 
@@ -135 +140 @@
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 async_answer_0(rid, rc);
-                                return;
+                                return rc;
                         }
                         async_wait_for(msg, &rc);
@@ -142 +147 @@
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 async_answer_0(rid, rc);
-                                return;
+                                return rc;
                         }
 
@@ -166 +171 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, rc);
-                        return;
+                        return rc;
                 } else {
                         /*
@@ -174 +179 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, ENOENT);
-                        return;
+                        return ENOENT;
                 }
         }
@@ -207 +212 @@
                 async_answer_0(rid, rc);
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                return;
+                return rc;
         }
         
@@ -222 +227 @@
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 async_answer_0(rid, rc);
-                return;
+                return rc;
         }
         
@@ -258 +263 @@
         async_answer_0(rid, rc);
         fibril_rwlock_write_unlock(&namespace_rwlock);
+        return rc;
 }
 
@@ -352 +358 @@
         }
         fibril_mutex_unlock(&fs_list_lock);
-        
-        /* Acknowledge that we know fs_name. */
-        async_answer_0(callid, EOK);
-        
+
+        /* Add the filesystem info to the list of mounted filesystems */
+        mtab_ent_t *mtab_ent = malloc(sizeof(mtab_ent_t));
+        if (!mtab_ent) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
+                free(mp);
+                free(fs_name);
+                free(opts);
+                return;
+        }
+
         /* Do the mount */
-        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+        rc = vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+        if (rc != EOK) {
+                async_answer_0(callid, ENOTSUP);
+                async_answer_0(rid, ENOTSUP);
+                free(mtab_ent);
+                free(mp);
+                free(opts);
+                free(fs_name);
+                return;
+        }
+
+        /* Add the filesystem info to the list of mounted filesystems */
+
+        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->instance = instance;
+        mtab_ent->service_id = service_id;
+
+        link_initialize(&mtab_ent->link);
+
+        fibril_mutex_lock(&mtab_list_lock);
+        list_append(&mtab_ent->link, &mtab_list);
+        mtab_size++;
+        fibril_mutex_unlock(&mtab_list_lock);
+
         free(mp);
         free(fs_name);
         free(opts);
+
+        /* Acknowledge that we know fs_name. */
+        async_answer_0(callid, EOK);
 }
 
@@ -433 +475 @@
                  */
                 
-                free(mp);
-                
                 exch = vfs_exchange_grab(mr_node->fs_handle);
                 rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
@@ -442 +482 @@
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, rc);
@@ -459 +500 @@
                 
                 rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
-                free(mp);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, rc);
@@ -470 +511 @@
                 if (!mp_node) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, ENOMEM);
@@ -482 +524 @@
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mp_node);
                         vfs_node_put(mr_node);
@@ -499 +542 @@
          */
         vfs_node_forget(mr_node);
-        
         fibril_rwlock_write_unlock(&namespace_rwlock);
+
+        fibril_mutex_lock(&mtab_list_lock);
+
+        int found = 0;
+
+        list_foreach(mtab_list, cur) {
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
+                    link);
+
+                if (str_cmp(mtab_ent->mp, mp) == 0) {
+                        list_remove(&mtab_ent->link);
+                        mtab_size--;
+                        free(mtab_ent);
+                        found = 1;
+                        break;
+                }
+        }
+        assert(found);
+        fibril_mutex_unlock(&mtab_list_lock);
+
+        free(mp);
+
         async_answer_0(rid, EOK);
 }
@@ -1289 +1353 @@
 }
 
+void vfs_get_mtab(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_callid_t callid;
+        ipc_call_t data;
+        sysarg_t rc = EOK;
+        size_t len;
+
+        fibril_mutex_lock(&mtab_list_lock);
+
+        /* Send to the caller the number of mounted filesystems */
+        callid = async_get_call(&data);
+        if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
+                rc = ENOTSUP;
+                async_answer_0(callid, rc);
+                goto exit;
+        }
+        async_answer_1(callid, EOK, mtab_size);
+
+        list_foreach(mtab_list, cur) {
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
+                    link);
+
+                rc = ENOTSUP;
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->mp,
+                    str_size(mtab_ent->mp));
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->opts,
+                    str_size(mtab_ent->opts));
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->fs_name,
+                    str_size(mtab_ent->fs_name));
+
+                callid = async_get_call(&data);
+
+                if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
+                        rc = ENOTSUP;
+                        async_answer_0(callid, rc);
+                        goto exit;
+                }
+
+                rc = EOK;
+                async_answer_2(callid, rc, mtab_ent->instance,
+                    mtab_ent->service_id);
+        }
+
+exit:
+        fibril_mutex_unlock(&mtab_list_lock);
+        async_answer_0(rid, rc);
+}
+
 /**
  * @}