From owner-svn-src-user@FreeBSD.ORG Wed Jul 3 16:50:39 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 91EE82CA; Wed, 3 Jul 2013 16:50:39 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 434CE18D5; Wed, 3 Jul 2013 16:50:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63GodYs038574; Wed, 3 Jul 2013 16:50:39 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63Goc30038571; Wed, 3 Jul 2013 16:50:38 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201307031650.r63Goc30038571@svn.freebsd.org> From: Attilio Rao Date: Wed, 3 Jul 2013 16:50:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252571 - in user/attilio/vmobj-readlock/sys: kern vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 16:50:39 -0000 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