Changeset 35b7d86e in mainline for uspace/lib/c

Timestamp:

2017-03-13T20:33:06Z (9 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/lib/c

Files:

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

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 *);