Changeset 4965357f in mainline

Timestamp:

2011-11-05T12:36:02Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c08fb04

Parents:

76a67ce

Message:

Fix get_mtab_list() libc implementation

Location:

uspace/lib/c

Files:

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

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

@@ -835 +835 @@
 {
         sysarg_t rc;
+        aid_t req;
         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;
+        sysarg_t num_mounted_fs;
+        
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_0(exch, VFS_IN_GET_MTAB, NULL);
 
         /* Ask VFS how many filesystems are mounted */
@@ -859 +858 @@
                 }
 
+                memset(mtab_list_ent, 0, sizeof(mtab_list_ent_t));
+
                 mtab_ent = &mtab_list_ent->mtab_ent;
 
-                rc = async_data_read_start(exch, (void *) &mtab_ent->mp,
+                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,
+                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,
+                rc = async_data_read_start(exch, (void *) mtab_ent->fs_name,
                         FS_NAME_MAXLEN);
                 if (rc != EOK)
@@ -877 +878 @@
 
                 sysarg_t p[3];
+
                 int j;
-
                 for (j = 0; j < 3; ++j) {
                         rc = async_req_0_1(exch, VFS_IN_PING, &p[j]);
@@ -894 +895 @@
 
 exit:
+        async_wait_for(req, &rc);
         vfs_exchange_end(exch);
         return rc;

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

@@ -42 +42 @@
 #include <stdio.h>
 #include <async.h>
+#include "vfs_mtab.h"
 
 enum vfs_change_state_type {