Changes in uspace/srv/vfs/vfs_ops.c [ec8bab59:0da4e41] in mainline

File:

• uspace/srv/vfs/vfs_ops.c (modified) (23 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -125 +125 @@
                             (ipcarg_t) dev_handle, &answer);
                         /* send the mount options */
-                        rc = ipc_data_write_start(phone, (void *)opts,
+                        rc = async_data_write_start(phone, (void *)opts,
                             str_size(opts));
                         if (rc != EOK) {
@@ -207 +207 @@
         
         /* send the mount options */
-        rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
+        rc = async_data_write_start(phone, (void *)opts, str_size(opts));
         if (rc != EOK) {
                 async_wait_for(msg, NULL);
@@ -268 +268 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -290 +290 @@
         
         /* Deliver the mount point. */
-        ipcarg_t retval = ipc_data_write_finalize(callid, mp, size);
+        ipcarg_t retval = async_data_write_finalize(callid, mp, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -299 +299 @@
         
         /* Now we expect to receive the mount options. */
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -324 +324 @@
 
         /* Deliver the mount options. */
-        retval = ipc_data_write_finalize(callid, opts, size);
+        retval = async_data_write_finalize(callid, opts, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -337 +337 @@
          * system.
          */
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -370 +370 @@
         
         /* Deliver the file system name. */
-        retval = ipc_data_write_finalize(callid, fs_name, size);
+        retval = async_data_write_finalize(callid, fs_name, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -469 +469 @@
         
         ipc_callid_t callid;
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -483 +483 @@
         
         int rc;
-        if ((rc = ipc_data_write_finalize(callid, path, len))) {
+        if ((rc = async_data_write_finalize(callid, path, len))) {
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -747 +747 @@
         int res;
         if (read)
-                res = ipc_data_read_receive(&callid, NULL);
+                res = async_data_read_receive(&callid, NULL);
         else 
-                res = ipc_data_write_receive(&callid, NULL);
+                res = async_data_write_receive(&callid, NULL);
         if (!res) {
                 ipc_answer_0(callid, EINVAL);
@@ -943 +943 @@
 
         ipc_callid_t callid;
-        if (!ipc_data_read_receive(&callid, NULL)) {
+        if (!async_data_read_receive(&callid, NULL)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -969 +969 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -981 +981 @@
         }
         int rc;
-        if ((rc = ipc_data_write_finalize(callid, path, len))) {
+        if ((rc = async_data_write_finalize(callid, path, len))) {
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -988 +988 @@
         path[len] = '\0';
 
-        if (!ipc_data_read_receive(&callid, NULL)) {
+        if (!async_data_read_receive(&callid, NULL)) {
                 free(path);
                 ipc_answer_0(callid, EINVAL);
@@ -1037 +1037 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -1049 +1049 @@
         }
         int rc;
-        if ((rc = ipc_data_write_finalize(callid, path, len))) {
+        if ((rc = async_data_write_finalize(callid, path, len))) {
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -1074 +1074 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -1086 +1086 @@
         }
         int rc;
-        if ((rc = ipc_data_write_finalize(callid, path, len))) {
+        if ((rc = async_data_write_finalize(callid, path, len))) {
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -1125 +1125 @@
 
         /* Retrieve the old path. */
-        if (!ipc_data_write_receive(&callid, &olen)) {
+        if (!async_data_write_receive(&callid, &olen)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -1136 +1136 @@
                 return;
         }
-        if ((rc = ipc_data_write_finalize(callid, old, olen))) {
+        if ((rc = async_data_write_finalize(callid, old, olen))) {
                 ipc_answer_0(rid, rc);
                 free(old);
@@ -1144 +1144 @@
         
         /* Retrieve the new path. */
-        if (!ipc_data_write_receive(&callid, &nlen)) {
+        if (!async_data_write_receive(&callid, &nlen)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -1157 +1157 @@
                 return;
         }
-        if ((rc = ipc_data_write_finalize(callid, new, nlen))) {
+        if ((rc = async_data_write_finalize(callid, new, nlen))) {
                 ipc_answer_0(rid, rc);
                 free(old);