Changeset cf2af94 in mainline for uspace/srv/fs/ext2/ext2_ops.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/fs/ext2/ext2_ops.c (modified) (8 diffs)

uspace/srv/fs/ext2/ext2_ops.c ¶

@@ -41 +41 @@
 #include <libblock.h>
 #include <libext2.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/devmap.h>
@@ -219 +218 @@
 //      devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
@@ -231 +230 @@
 //      devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
@@ -252 +251 @@
         
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
@@ -263 +262 @@
         
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
@@ -274 +273 @@
         
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
 void ext2_close(ipc_callid_t rid, ipc_call_t *request)
 {
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
 }
 
@@ -288 +287 @@
         
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }
 
@@ -307 +306 @@
         
         // TODO
-        ipc_answer_0(rid, ENOTSUP);
+        async_answer_0(rid, ENOTSUP);
 }