svn commit: r208791 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Thu Jun  3 18:34:34 2010
New Revision: 208791
URL: http://svn.freebsd.org/changeset/base/208791

Log:
  Do not leak vm page lock in vm_contig_launder(), vm_pageout_page_lock()
  always returns with the page locked.
  
  Submitted by:	alc
  Pointy hat to:	kib

Modified:
  head/sys/vm/vm_contig.c

Modified: head/sys/vm/vm_contig.c
==============================================================================
--- head/sys/vm/vm_contig.c	Thu Jun  3 17:55:42 2010	(r208790)
+++ head/sys/vm/vm_contig.c	Thu Jun  3 18:34:34 2010	(r208791)
@@ -168,8 +168,10 @@ vm_contig_launder(int queue)
 		if ((m->flags & PG_MARKER) != 0)
 			continue;
 
-		if (!vm_pageout_page_lock(m, &next))
+		if (!vm_pageout_page_lock(m, &next)) {
+			vm_page_unlock(m);
 			continue;
+		}
 		KASSERT(VM_PAGE_INQUEUE2(m, queue),
 		    ("vm_contig_launder: page %p's queue is not %d", m, queue));
 		error = vm_contig_launder_page(m, &next);