Date: Mon, 5 Aug 2013 12:52:37 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253963 - user/attilio/vmobj-readlock/sys/vm Message-ID: <201308051252.r75Cqbdq082084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Mon Aug 5 12:52:37 2013 New Revision: 253963 URL: http://svnweb.freebsd.org/changeset/base/253963 Log: Fix mismerge. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/vm/vm_fault.c Modified: user/attilio/vmobj-readlock/sys/vm/vm_fault.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/vm_fault.c Mon Aug 5 12:51:20 2013 (r253962) +++ user/attilio/vmobj-readlock/sys/vm/vm_fault.c Mon Aug 5 12:52:37 2013 (r253963) @@ -941,8 +941,7 @@ vnode_locked: vm_page_hold(fs.m); } vm_page_unlock(fs.m); - if (m_hold == NULL || (fault_flags & VM_FAULT_SBUSY) == 0) - vm_page_xunbusy(fs.m); + vm_page_xunbusy(fs.m); /* * Unlock everything, and return
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308051252.r75Cqbdq082084>