svn commit: r253963 - user/attilio/vmobj-readlock/sys/vm

[Attilio Rao]

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