Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [4cac2d69:0055cfd] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -168 +168 @@
                     (nodep->index == key[NODES_KEY_INDEX]));
         default:
-                abort();
-        }
+                assert((keys == 1) || (keys == 2));
+        }
+
+        return 0;
 }
 
@@ -439 +441 @@
 {
         dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-        
-        /* 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);
+        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.
+         */
+        rc = tmpfs_root_get(&rootfn, dev_handle);
+        if ((rc == EOK) && (rootfn)) {
+                (void) tmpfs_node_put(rootfn);
+                free(opts);
+                ipc_answer_0(rid, EEXIST);
                 return;
         }
@@ -456 +484 @@
         }
 
-        fs_node_t *rootfn;
         rc = tmpfs_root_get(&rootfn, dev_handle);
         assert(rc == EOK);