Changeset 5bb9907 in mainline

Timestamp:

2011-07-26T19:54:53Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

867e2555, ceb890b

Parents:

7eb0fed8

Message:

Fix VFS_OUT_READ and VFS_OUT_WRITE with respect to 64-bit file sizes.

Location:

uspace

Files:

• lib/fs/libfs.c (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/lib/fs/libfs.c

@@ -157 +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);

uspace/srv/vfs/vfs_ops.c

@@ -796 +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);
         }
         
@@ -822 +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);
         }