Changeset 696979ce in mainline for uspace/srv/fs

Timestamp:

2010-02-06T10:54:21Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bda2f96

Parents:

3f93cdbe (diff), 25e963a (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 from mainline.

Location:

uspace/srv/fs

Files:

• devfs/devfs_ops.c (modified) (1 diff)
• fat/fat_ops.c (modified) (1 diff)
• tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/srv/fs/devfs/devfs_ops.c

@@ -419 +419 @@
         
         /* Accept the mount options */
-        ipcarg_t retval = async_data_string_receive(&opts, 0);
+        ipcarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
+            0, NULL);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);

uspace/srv/fs/fat/fat_ops.c

@@ -974 +974 @@
         uint16_t bps;
         uint16_t rde;
-        int rc;
-
-        /* accept the mount options */
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        char *opts = malloc(size + 1);
-        if (!opts) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
-        if (retval != EOK) {
-                ipc_answer_0(rid, retval);
-                free(opts);
-                return;
-        }
-        opts[size] = '\0';
+        
+        /* Accept the mount options */
+        char *opts;
+        int rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
+        
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
+                return;
+        }
 
         /* Check for option enabling write through. */

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -443 +443 @@
         fs_node_t *rootfn;
         int rc;
-
-        /* accept the mount options */
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        char *opts = malloc(size + 1);
-        if (!opts) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
-        if (retval != EOK) {
-                ipc_answer_0(rid, retval);
-                free(opts);
-                return;
-        }
-        opts[size] = '\0';
-
-        /*
-         * Check if this device is not already mounted.
-         */
+        
+        /* Accept the mount options. */
+        char *opts;
+        rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
+                return;
+        }
+
+        /* Check if this device is not already mounted. */
         rc = tmpfs_root_get(&rootfn, dev_handle);
         if ((rc == EOK) && (rootfn)) {