sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed m_vm_vfs to m_vm_vfs_mmap.

Browse source 
Stay coherent with the naming scheme of the messages.

Change-Id: Icc0e13a88ec29263502166c0e6eec81cdb974663
This commit is contained in:
Lionel Sambuc 2013-11-28 18:59:46 +01:00
parent e69e14895d
commit 301f5f87f0
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/minix/ipc.h
View file

@ -186,9 +186,9 @@ typedef struct {
mess_11 m_m11; mess_11 m_m11;
mess_mmap m_mmap; mess_mmap m_mmap;
mess_notify m_notify; mess_notify m_notify;
mess_vm_vfs_mmap m_vm_vfs_mmap;
mess_vmmcp m_vmmcp; mess_vmmcp m_vmmcp;
mess_vmmcp_reply m_vmmcp_reply; mess_vmmcp_reply m_vmmcp_reply;
mess_vm_vfs_mmap m_vm_vfs;
mess_sigcalls m_sigcalls; /* SYS_{GETKSIG,ENDKSIG,KILL,SIGSEND,SIGRETURN} */ mess_sigcalls m_sigcalls; /* SYS_{GETKSIG,ENDKSIG,KILL,SIGSEND,SIGRETURN} */
u8_t size[56]; /* message payload may have 56 bytes at most */ u8_t size[56]; /* message payload may have 56 bytes at most */
}; };

18
lib/libc/sys-minix/mmap.c
View file

@ -58,15 +58,15 @@ int minix_vfs_mmap(endpoint_t who, off_t offset, size_t len,
memset(&m, 0, sizeof(message)); memset(&m, 0, sizeof(message));
m.m_vm_vfs.who = who; m.m_vm_vfs_mmap.who = who;
m.m_vm_vfs.offset = offset; m.m_vm_vfs_mmap.offset = offset;
m.m_vm_vfs.dev = dev; m.m_vm_vfs_mmap.dev = dev;
m.m_vm_vfs.ino = ino; m.m_vm_vfs_mmap.ino = ino;
m.m_vm_vfs.vaddr = vaddr; m.m_vm_vfs_mmap.vaddr = vaddr;
m.m_vm_vfs.len = len; m.m_vm_vfs_mmap.len = len;
m.m_vm_vfs.fd = fd; m.m_vm_vfs_mmap.fd = fd;
m.m_vm_vfs.clearend = clearend; m.m_vm_vfs_mmap.clearend = clearend;
m.m_vm_vfs.flags = flags; m.m_vm_vfs_mmap.flags = flags;
return _syscall(VM_PROC_NR, VM_VFS_MMAP, &m); return _syscall(VM_PROC_NR, VM_VFS_MMAP, &m);
} }

14
servers/vm/mmap.c
View file

@ -141,18 +141,18 @@ int do_vfs_mmap(message *m)
/* It might be disabled */ /* It might be disabled */
if(!enable_filemap) return ENXIO; if(!enable_filemap) return ENXIO;
clearend = m->m_vm_vfs.clearend; clearend = m->m_vm_vfs_mmap.clearend;
flags = m->m_vm_vfs.flags; flags = m->m_vm_vfs_mmap.flags;
if((r=vm_isokendpt(m->m_vm_vfs.who, &n)) != OK) if((r=vm_isokendpt(m->m_vm_vfs_mmap.who, &n)) != OK)
panic("bad ep %d from vfs", m->m_vm_vfs.who); panic("bad ep %d from vfs", m->m_vm_vfs_mmap.who);
vmp = &vmproc[n]; 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, 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, (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); clearend, flags, 0);
} }