From owner-svn-src-head@FreeBSD.ORG  Sun May  2 19:25:22 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 86866106566B;
	Sun,  2 May 2010 19:25:22 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 76E768FC19;
	Sun,  2 May 2010 19:25:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42JPMVR051329;
	Sun, 2 May 2010 19:25:22 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42JPM2L051327;
	Sun, 2 May 2010 19:25:22 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201005021925.o42JPM2L051327@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 2 May 2010 19:25:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207535 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 May 2010 19:25:22 -0000

Author: kib
Date: Sun May  2 19:25:22 2010
New Revision: 207535
URL: http://svn.freebsd.org/changeset/base/207535

Log:
  Lock the page around hold_count access.
  
  Reviewed by:	alc

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c	Sun May  2 19:10:27 2010	(r207534)
+++ head/sys/kern/uipc_syscalls.c	Sun May  2 19:25:22 2010	(r207535)
@@ -2108,6 +2108,7 @@ retry_space:
 				mbstat.sf_iocnt++;
 			}
 			if (error) {
+				vm_page_lock(pg);
 				vm_page_lock_queues();
 				vm_page_unwire(pg, 0);
 				/*
@@ -2121,6 +2122,7 @@ retry_space:
 					vm_page_free(pg);
 				}
 				vm_page_unlock_queues();
+				vm_page_unlock(pg);
 				VM_OBJECT_UNLOCK(obj);
 				if (error == EAGAIN)
 					error = 0;	/* not a real error */