Changeset 35b7d86e in mainline

Timestamp:

2017-03-13T20:33:06Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8ffedd8

Parents:

ea56098

Message:

Remove VFS_IN_MTAB_GET

The mountpoints in VFS don't know their path anymore and it does not
make much sense to maintain this global mount table when tasks can have
different roots.

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• app/df/df.c (modified) (1 diff)
• 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) (1 diff)
• srv/vfs/vfs_ipc.c (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (7 diffs)

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

@@ -32 +32 @@
 #include <str_error.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_mtab.h>
 #include <adt/list.h>
 #include <errno.h>

uspace/app/df/df.c

@@ -44 +44 @@
 #include <adt/list.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_mtab.h>
 
 #define NAME  "df"

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

@@ -1106 +1106 @@
 int vfs_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 == NULL) {
-                        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);
+        sysarg_t rc = ENOTSUP;
+        
         return rc;
 }

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

@@ -69 +69 @@
         VFS_IN_FSTAT,
         VFS_IN_CLOSE,
-        VFS_IN_PING,
         VFS_IN_MOUNT,
         VFS_IN_UNMOUNT,
@@ -78 +77 @@
         VFS_IN_DUP,
         VFS_IN_WAIT_HANDLE,
-        VFS_IN_MTAB_GET,
         VFS_IN_STATFS,
         VFS_IN_WALK,

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

@@ -42 +42 @@
 #include <stdio.h>
 #include <async.h>
-#include "vfs_mtab.h"
-
 
 enum vfs_change_state_type {
         VFS_PASS_HANDLE
 };
-
 
 extern char *vfs_absolutize(const char *, size_t *);

uspace/srv/vfs/vfs_ipc.c

@@ -110 +110 @@
 }
 
-static void vfs_in_mtab_get(ipc_callid_t rid, ipc_call_t *request)
-{
-        int rc = vfs_op_mtab_get();
-        async_answer_0(rid, rc);
-}
-
 static void vfs_in_open2(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -306 +300 @@
                         vfs_in_mount(callid, &call);
                         break;
-                case VFS_IN_MTAB_GET:
-                        vfs_in_mtab_get(callid, &call);
-                        break;
                 case VFS_IN_OPEN2:
                         vfs_in_open2(callid, &call);

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. */
@@ -243 +238 @@
         vfs_file_t *file = NULL;
         int fd = -1;
-        mtab_ent_t *mtab_ent = NULL;
         
         if (!(flags & VFS_MOUNT_CONNECT_ONLY)) {
@@ -274 +268 @@
                         goto out;
                 }
-        }
-        
-        /* Add the filesystem info to the list of mounted filesystems */
-        mtab_ent = malloc(sizeof(mtab_ent_t));
-        if (!mtab_ent) {
-                rc = ENOMEM;
-                goto out;
         }
         
@@ -301 +288 @@
         }
         
-        
         if (flags & VFS_MOUNT_NO_REF) {
                 vfs_node_delref(root);
@@ -313 +299 @@
         }
         
-        /* Add the filesystem info to the list of mounted filesystems */
-        str_cpy(mtab_ent->mp, MAX_PATH_LEN, "fixme");
-        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);   
-
 out:
         if (mp) {
@@ -340 +312 @@
         
         *outfd = fd;
-        return rc;
-}
-
-int vfs_op_mtab_get(void)
-{
-        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, link, mtab_ent_t, mtab_ent) {
-                rc = ENOTSUP;
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                (void) async_data_read_finalize(callid, mtab_ent->mp,
-                    str_size(mtab_ent->mp));
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                (void) async_data_read_finalize(callid, mtab_ent->opts,
-                    str_size(mtab_ent->opts));
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        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) {
-                        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);
         return rc;
 }
@@ -984 +894 @@
         fibril_rwlock_write_unlock(&namespace_rwlock);
         
-        fibril_mutex_lock(&mtab_list_lock);
-        int found = 0;
-
-        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
-                // FIXME: mp name
-                if (str_cmp(mtab_ent->mp, "fixme") == 0) {
-                        list_remove(&mtab_ent->link);
-                        mtab_size--;
-                        free(mtab_ent);
-                        found = 1;
-                        break;
-                }
-        }
-        assert(found);
-        fibril_mutex_unlock(&mtab_list_lock);
-        
         vfs_file_put(mp);
         return EOK;