Changeset 7eb0fed8 in mainline for uspace/srv

Timestamp:

2011-07-26T19:43:37Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bb9907

Parents:

3fb0fec

Message:

Fix VFS_OUT_MOUNT and VFS_OUT_MOUNTED with respect to 64-bit file sizes.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -76 +76 @@
         vfs_node_t *mr_node;
         fs_index_t rindex;
-        size_t rsize;
+        aoff64_t rsize;
         unsigned rlnkcnt;
         async_exch_t *exch;
@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (size_t) IPC_GET_ARG2(answer);
-                        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
                         mr_res.triplet.fs_handle = fs_handle;
@@ -229 +229 @@
         if (rc == EOK) {
                 rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                rsize = (size_t) IPC_GET_ARG2(answer);
-                rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+                rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                    IPC_GET_ARG3(answer));
+                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                 
                 mr_res.triplet.fs_handle = fs_handle;