Changeset 4f5dc18 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (9 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -897 +897 @@
         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);
@@ -908 +908 @@
                 return;
         }
-        ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
+        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -1047 +1047 @@
         ipc_callid_t callid;
         size_t len;
-        if (!ipc_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&callid, &len)) {
                 fat_node_put(fn);
                 ipc_answer_0(callid, EINVAL);
@@ -1066 +1066 @@
                         /* reading beyond the EOF */
                         bytes = 0;
-                        (void) ipc_data_read_finalize(callid, NULL, 0);
+                        (void) async_data_read_finalize(callid, NULL, 0);
                 } else {
                         bytes = min(len, bps - pos % bps);
@@ -1073 +1073 @@
                             BLOCK_FLAGS_NONE);
                         assert(rc == EOK);
-                        (void) ipc_data_read_finalize(callid, b->data + pos % bps,
+                        (void) async_data_read_finalize(callid, b->data + pos % bps,
                             bytes);
                         rc = block_put(b);
@@ -1131 +1131 @@
                 return;
 hit:
-                (void) ipc_data_read_finalize(callid, name, str_size(name) + 1);
+                (void) async_data_read_finalize(callid, name, str_size(name) + 1);
                 bytes = (pos - spos) + 1;
         }
@@ -1169 +1169 @@
         ipc_callid_t callid;
         size_t len;
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 fat_node_put(fn);
                 ipc_answer_0(callid, EINVAL);
@@ -1204 +1204 @@
                 rc = fat_block_get(&b, bs, nodep, pos / bps, flags);
                 assert(rc == EOK);
-                (void) ipc_data_write_finalize(callid, b->data + pos % bps,
+                (void) async_data_write_finalize(callid, b->data + pos % bps,
                     bytes);
                 b->dirty = true;                /* need to sync block */
@@ -1241 +1241 @@
                     flags);
                 assert(rc == EOK);
-                (void) ipc_data_write_finalize(callid, b->data + pos % bps,
+                (void) async_data_write_finalize(callid, b->data + pos % bps,
                     bytes);
                 b->dirty = true;                /* need to sync block */