Changeset ceb890b in mainline for uspace/lib/fs/libfs.c

Timestamp:

2011-07-26T19:59:36Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75aa59a

Parents:

aa865ee (diff), 5bb9907 (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 lp:~jakub/helenos/fs.

File:

• uspace/lib/fs/libfs.c (modified) (3 diffs)

uspace/lib/fs/libfs.c

@@ -93 +93 @@
         rc = vfs_out_ops->mounted(devmap_handle, opts, &index, &size, &lnkcnt);
 
-        if (rc == EOK)  // FIXME: size is 64-bit
-                async_answer_3(rid, EOK, index, size, lnkcnt);
+        if (rc == EOK)
+                async_answer_4(rid, EOK, index, LOWER32(size), UPPER32(size),
+                    lnkcnt);
         else
                 async_answer_0(rid, rc);
@@ -156 +157 @@
         rc = vfs_out_ops->write(devmap_handle, index, pos, &wbytes, &nsize);
 
-        if (rc == EOK)  // FIXME: nsize is 64-bit
-                async_answer_2(rid, EOK, wbytes, nsize);
+        if (rc == EOK)
+                async_answer_3(rid, EOK, wbytes, LOWER32(nsize), UPPER32(nsize));
         else
                 async_answer_0(rid, rc);
@@ -434 +435 @@
          * Do not release the FS node so that it stays in memory.
          */
-        async_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
-            IPC_GET_ARG3(answer));
+        async_answer_4(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
+            IPC_GET_ARG3(answer), IPC_GET_ARG4(answer));
 }