From 301f5f87f027e1129d85a4749a41d5221337fc5e Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Thu, 28 Nov 2013 18:59:46 +0100 Subject: [PATCH] Renamed m_vm_vfs to m_vm_vfs_mmap. Stay coherent with the naming scheme of the messages. Change-Id: Icc0e13a88ec29263502166c0e6eec81cdb974663 --- include/minix/ipc.h | 2 +- lib/libc/sys-minix/mmap.c | 18 +++++++++--------- servers/vm/mmap.c | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/minix/ipc.h b/include/minix/ipc.h index 3eaa0b9f2..9213e323e 100644 --- a/include/minix/ipc.h +++ b/include/minix/ipc.h @@ -186,9 +186,9 @@ typedef struct { mess_11 m_m11; mess_mmap m_mmap; mess_notify m_notify; + mess_vm_vfs_mmap m_vm_vfs_mmap; mess_vmmcp m_vmmcp; mess_vmmcp_reply m_vmmcp_reply; - mess_vm_vfs_mmap m_vm_vfs; mess_sigcalls m_sigcalls; /* SYS_{GETKSIG,ENDKSIG,KILL,SIGSEND,SIGRETURN} */ u8_t size[56]; /* message payload may have 56 bytes at most */ }; diff --git a/lib/libc/sys-minix/mmap.c b/lib/libc/sys-minix/mmap.c index 616c2bd33..5d9eec954 100644 --- a/lib/libc/sys-minix/mmap.c +++ b/lib/libc/sys-minix/mmap.c @@ -58,15 +58,15 @@ int minix_vfs_mmap(endpoint_t who, off_t offset, size_t len, memset(&m, 0, sizeof(message)); - m.m_vm_vfs.who = who; - m.m_vm_vfs.offset = offset; - m.m_vm_vfs.dev = dev; - m.m_vm_vfs.ino = ino; - m.m_vm_vfs.vaddr = vaddr; - m.m_vm_vfs.len = len; - m.m_vm_vfs.fd = fd; - m.m_vm_vfs.clearend = clearend; - m.m_vm_vfs.flags = flags; + m.m_vm_vfs_mmap.who = who; + m.m_vm_vfs_mmap.offset = offset; + m.m_vm_vfs_mmap.dev = dev; + m.m_vm_vfs_mmap.ino = ino; + m.m_vm_vfs_mmap.vaddr = vaddr; + m.m_vm_vfs_mmap.len = len; + m.m_vm_vfs_mmap.fd = fd; + m.m_vm_vfs_mmap.clearend = clearend; + m.m_vm_vfs_mmap.flags = flags; return _syscall(VM_PROC_NR, VM_VFS_MMAP, &m); } diff --git a/servers/vm/mmap.c b/servers/vm/mmap.c index 52977cad9..bedd076fb 100644 --- a/servers/vm/mmap.c +++ b/servers/vm/mmap.c @@ -141,18 +141,18 @@ int do_vfs_mmap(message *m) /* It might be disabled */ if(!enable_filemap) return ENXIO; - clearend = m->m_vm_vfs.clearend; - flags = m->m_vm_vfs.flags; + clearend = m->m_vm_vfs_mmap.clearend; + flags = m->m_vm_vfs_mmap.flags; - if((r=vm_isokendpt(m->m_vm_vfs.who, &n)) != OK) - panic("bad ep %d from vfs", m->m_vm_vfs.who); + if((r=vm_isokendpt(m->m_vm_vfs_mmap.who, &n)) != OK) + panic("bad ep %d from vfs", m->m_vm_vfs_mmap.who); vmp = &vmproc[n]; - return mmap_file(vmp, m->m_vm_vfs.fd, m->m_vm_vfs.offset, + return mmap_file(vmp, m->m_vm_vfs_mmap.fd, m->m_vm_vfs_mmap.offset, MAP_PRIVATE | MAP_FIXED, - m->m_vm_vfs.ino, m->m_vm_vfs.dev, + m->m_vm_vfs_mmap.ino, m->m_vm_vfs_mmap.dev, (u64_t) LONG_MAX * VM_PAGE_SIZE, - m->m_vm_vfs.vaddr, m->m_vm_vfs.len, &v, + m->m_vm_vfs_mmap.vaddr, m->m_vm_vfs_mmap.len, &v, clearend, flags, 0); } -- 2.44.0