Changeset 00aece0 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (4 diffs)

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

@@ -143 +143 @@
 
 int mount(const char *fs_name, const char *mp, const char *fqsn,
-    const char *opts, unsigned int flags)
+    const char *opts, unsigned int flags, unsigned int instance)
 {
         int null_id = -1;
@@ -181 +181 @@
 
         sysarg_t rc_orig;
-        aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL);
+        aid_t req = async_send_3(exch, VFS_IN_MOUNT, service_id, flags,
+            instance, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -654 +655 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_0(exch, VFS_IN_UNLINK, NULL);
+        req = async_send_1(exch, VFS_IN_UNLINK, lflag, NULL);
         rc = async_data_write_start(exch, pa, pa_size);
         if (rc != EOK) {
@@ -830 +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;
+}
+
 /** @}
  */