Date: Wed, 3 Jul 2013 16:50:38 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252571 - in user/attilio/vmobj-readlock/sys: kern vm Message-ID: <201307031650.r63Goc30038571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Wed Jul 3 16:50:38 2013 New Revision: 252571 URL: http://svnweb.freebsd.org/changeset/base/252571 Log: Rename VM_FAULT_IOBUSY into VM_FAULT_RBUSY. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/kern/sys_process.c user/attilio/vmobj-readlock/sys/vm/vm_fault.c user/attilio/vmobj-readlock/sys/vm/vm_map.h Modified: user/attilio/vmobj-readlock/sys/kern/sys_process.c ============================================================================== --- user/attilio/vmobj-readlock/sys/kern/sys_process.c Wed Jul 3 16:44:57 2013 (r252570) +++ user/attilio/vmobj-readlock/sys/kern/sys_process.c Wed Jul 3 16:50:38 2013 (r252571) @@ -263,7 +263,7 @@ proc_rwmem(struct proc *p, struct uio *u writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; - fault_flags |= VM_FAULT_IOBUSY; + fault_flags |= VM_FAULT_RBUSY; /* * Only map in one page at a time. We don't have to, but it Modified: user/attilio/vmobj-readlock/sys/vm/vm_fault.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/vm_fault.c Wed Jul 3 16:44:57 2013 (r252570) +++ user/attilio/vmobj-readlock/sys/vm/vm_fault.c Wed Jul 3 16:50:38 2013 (r252571) @@ -925,13 +925,13 @@ vnode_locked: vm_page_activate(fs.m); if (m_hold != NULL) { *m_hold = fs.m; - if (fault_flags & VM_FAULT_IOBUSY) + if (fault_flags & VM_FAULT_RBUSY) vm_page_busy_downgrade(fs.m); else vm_page_hold(fs.m); } vm_page_unlock(fs.m); - if (m_hold == NULL || (fault_flags & VM_FAULT_IOBUSY) == 0) + if (m_hold == NULL || (fault_flags & VM_FAULT_RBUSY) == 0) vm_page_busy_wunlock(fs.m); /* Modified: user/attilio/vmobj-readlock/sys/vm/vm_map.h ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/vm_map.h Wed Jul 3 16:44:57 2013 (r252570) +++ user/attilio/vmobj-readlock/sys/vm/vm_map.h Wed Jul 3 16:50:38 2013 (r252571) @@ -328,7 +328,7 @@ long vmspace_resident_count(struct vmspa #define VM_FAULT_NORMAL 0 /* Nothing special */ #define VM_FAULT_CHANGE_WIRING 1 /* Change the wiring as appropriate */ #define VM_FAULT_DIRTY 2 /* Dirty the page; use w/VM_PROT_COPY */ -#define VM_FAULT_IOBUSY 4 /* Busy the faulted page */ +#define VM_FAULT_RBUSY 4 /* Busy the faulted page */ /* * Initially, mappings are slightly sequential. The maximum window size must
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307031650.r63Goc30038571>