64-bit VFS_VMCALL_OFFSET

Change-Id: I29725365a199f850420cd0e4e3902cf70dffe9ad

diff --git a/include/minix/com.h b/include/minix/com.h
index 7a1bbc5b1c425e15afbae134b7a4237c18bce290..9cf61dfc982e4b272c7d1dee1cb926bca5a25d1d 100644 (file)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -871,8 +871,7 @@
 #      define VFS_VMCALL_FD            m10_i2
 #      define VFS_VMCALL_REQID         m10_i3
 #      define VFS_VMCALL_ENDPOINT      m10_i4
-#      define VFS_VMCALL_OFFSET_LO     m10_l1
-#      define VFS_VMCALL_OFFSET_HI     m10_l2
+#      define VFS_VMCALL_OFFSET        m10_ull1
 #      define VFS_VMCALL_LENGTH        m10_l3
 
 /* Request codes to from VM to VFS */

diff --git a/servers/vfs/misc.c b/servers/vfs/misc.c
index 7ff9dd4f074c59ae0c274a8a8610f15980d791cc..7dcbb3276875569c25f482c855bfb1f3263e8886 100644 (file)
--- a/servers/vfs/misc.c
+++ b/servers/vfs/misc.c
@@ -349,8 +349,7 @@ int do_vm_call(void)
        int req_fd = job_m_in.VFS_VMCALL_FD;
        u32_t req_id = job_m_in.VFS_VMCALL_REQID;
        endpoint_t ep = job_m_in.VFS_VMCALL_ENDPOINT;
-       u64_t offset = make64(job_m_in.VFS_VMCALL_OFFSET_LO,
-               job_m_in.VFS_VMCALL_OFFSET_HI);
+       u64_t offset = job_m_in.VFS_VMCALL_OFFSET;
        u32_t length = job_m_in.VFS_VMCALL_LENGTH;
        int result = OK;
        int slot;

diff --git a/servers/vm/vfs.c b/servers/vm/vfs.c
index ffb5bec964935162f8297d57152d728581c8af70..c7ab5e7cf1801fda7212763ae57b4b8211e88abd 100644 (file)
--- a/servers/vm/vfs.c
+++ b/servers/vm/vfs.c
@@ -86,8 +86,7 @@ int vfs_request(int reqno, int fd, struct vmproc *vmp, u64_t offset, u32_t len,
        m->VFS_VMCALL_FD = fd;
        m->VFS_VMCALL_REQID = reqid;
        m->VFS_VMCALL_ENDPOINT = vmp->vm_endpoint;
-       m->VFS_VMCALL_OFFSET_LO = ex64lo(offset);
-       m->VFS_VMCALL_OFFSET_HI = ex64hi(offset);
+       m->VFS_VMCALL_OFFSET = offset;
        m->VFS_VMCALL_LENGTH = len;
 
        reqnode->who = vmp->vm_endpoint;