svn commit: r207253 - user/kmacy/head_page_lock_2/sys/vm

[Kip Macy]

Author: kmacy
Date: Mon Apr 26 23:57:07 2010
New Revision: 207253
URL: http://svn.freebsd.org/changeset/base/207253

Log:
  sync whitespace and hold_count check with head

Modified:
  user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 26 21:10:10 2010	(r207252)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 26 23:57:07 2010	(r207253)
@@ -306,6 +306,7 @@ vm_pageout_clean(vm_page_t m)
 		vm_page_unlock(m);
 		return 0;
 	}
+
 	mc[vm_pageout_page_count] = m;
 	pageout_count = 1;
 	page_base = vm_pageout_page_count;
@@ -777,13 +778,14 @@ rescan0:
 		 * queue, most likely are being paged out.
 		 */
 		if (!VM_OBJECT_TRYLOCK(object) &&
-		    !vm_pageout_fallback_object_lock(m, &next)) {
+		    (!vm_pageout_fallback_object_lock(m, &next) ||
+			m->hold_count != 0)) {
 			VM_OBJECT_UNLOCK(object);
 			vm_page_unlock(m);
 			addl_page_shortage++;
 			continue;
 		}
-		if (m->busy || (m->oflags & VPO_BUSY) || m->hold_count) {
+		if (m->busy || (m->oflags & VPO_BUSY)) {
 			vm_page_unlock(m);
 			VM_OBJECT_UNLOCK(object);
 			addl_page_shortage++;