From owner-svn-src-all@FreeBSD.ORG  Wed Aug  6 19:34:04 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4DFDA7AE
 for <svn-src-all@freebsd.org>; Wed,  6 Aug 2014 19:34:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 243152A27
 for <svn-src-all@freebsd.org>; Wed,  6 Aug 2014 19:34:04 +0000 (UTC)
Received: from kib (uid 1100) (envelope-from kib@FreeBSD.org) id 57cb
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 19:34:04 +0000
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 6 Aug 2014 19:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269643 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e2832c.57cb.3d6fef35@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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, 06 Aug 2014 19:34:04 -0000

Author: kib
Date: Wed Aug  6 19:34:03 2014
New Revision: 269643
URL: http://svnweb.freebsd.org/changeset/base/269643

Log:
  The vm_pager_page_unswapped() pager op is only implemented for the
  swap pager.  Swap pager uses a private mutex to protect swap metadata,
  and does not rely on the vm object lock to ensure integrity of it.
  
  Weaken the requirement for the vm object lock by only asserting locked
  object in vm_pager_page_unswapped(), instead of locked exclusively.
  
  Reviewed by:	alc
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/vm/vm_pager.h

Modified: head/sys/vm/vm_pager.h
==============================================================================
--- head/sys/vm/vm_pager.h	Wed Aug  6 19:30:35 2014	(r269642)
+++ head/sys/vm/vm_pager.h	Wed Aug  6 19:34:03 2014	(r269643)
@@ -187,7 +187,7 @@ static __inline void
 vm_pager_page_unswapped(vm_page_t m)
 {
 
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
+	VM_OBJECT_ASSERT_LOCKED(m->object);
 	if (pagertab[m->object->type]->pgo_pageunswapped)
 		(*pagertab[m->object->type]->pgo_pageunswapped)(m);
 }