From owner-svn-src-all@FreeBSD.ORG  Wed Jun 16 00:41:21 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED0CA1065673;
	Wed, 16 Jun 2010 00:41:21 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DC4908FC17;
	Wed, 16 Jun 2010 00:41:21 +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 o5G0fLce041273;
	Wed, 16 Jun 2010 00:41:21 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5G0fLvZ041271;
	Wed, 16 Jun 2010 00:41:21 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201006160041.o5G0fLvZ041271@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Wed, 16 Jun 2010 00:41:21 +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: r209226 - head/sys/fs/tmpfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jun 2010 00:41:22 -0000

Author: alc
Date: Wed Jun 16 00:41:21 2010
New Revision: 209226
URL: http://svn.freebsd.org/changeset/base/209226

Log:
  Eliminate unnecessary page queues locking.

Modified:
  head/sys/fs/tmpfs/tmpfs_vnops.c

Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c	Tue Jun 15 23:55:42 2010	(r209225)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c	Wed Jun 16 00:41:21 2010	(r209226)
@@ -653,9 +653,7 @@ lookupvpg:
 			goto lookupvpg;
 		}
 		vm_page_busy(vpg);
-		vm_page_lock_queues();
 		vm_page_undirty(vpg);
-		vm_page_unlock_queues();
 		VM_OBJECT_UNLOCK(vobj);
 		error = uiomove_fromphys(&vpg, offset, tlen, uio);
 	} else {
@@ -690,15 +688,13 @@ nocache:
 out:
 	if (vobj != NULL)
 		VM_OBJECT_LOCK(vobj);
-	vm_page_lock(tpg);
-	vm_page_lock_queues();
 	if (error == 0) {
 		KASSERT(tpg->valid == VM_PAGE_BITS_ALL,
 		    ("parts of tpg invalid"));
 		vm_page_dirty(tpg);
 	}
+	vm_page_lock(tpg);
 	vm_page_unwire(tpg, TRUE);
-	vm_page_unlock_queues();
 	vm_page_unlock(tpg);
 	vm_page_wakeup(tpg);
 	if (vpg != NULL)