Changeset ceb890b in mainline

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.

Location:

uspace

Files:

• lib/fs/libfs.c (modified) (3 diffs)
• srv/vfs/vfs_ops.c (modified) (5 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));
 }
 

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;
@@ -795 +796 @@
         ipc_call_t answer;
         if (read) {
-                rc = async_data_read_forward_3_1(fs_exch, VFS_OUT_READ,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
+                rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
         } else {
                 if (file->append)
                         file->pos = file->node->size;
                 
-                rc = async_data_write_forward_3_1(fs_exch, VFS_OUT_WRITE,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
+                rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
         }
         
@@ -821 +822 @@
                 /* Update the cached version of node's size. */
                 if (rc == EOK)
-                        file->node->size = IPC_GET_ARG2(answer); 
+                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);
         }