From owner-svn-src-user@FreeBSD.ORG  Wed Feb  6 15:06:26 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B0ACF727;
 Wed,  6 Feb 2013 15:06:26 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 998AF100;
 Wed,  6 Feb 2013 15:06:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16F6QwT054411;
 Wed, 6 Feb 2013 15:06:26 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16F6Q2I054410;
 Wed, 6 Feb 2013 15:06:26 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201302061506.r16F6Q2I054410@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 6 Feb 2013 15:06:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r246410 - user/attilio/vmc-playground/sys/fs/tmpfs
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 15:06:26 -0000

Author: attilio
Date: Wed Feb  6 15:06:26 2013
New Revision: 246410
URL: http://svnweb.freebsd.org/changeset/base/246410

Log:
  Revert previously added locking to tmpfs_mapped{read, write}.
  This part needs to be overhauled anyway and this will be done in a
  separate branch.
  Just cope with changes to let the radix trie compile.

Modified:
  user/attilio/vmc-playground/sys/fs/tmpfs/tmpfs_vnops.c

Modified: user/attilio/vmc-playground/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- user/attilio/vmc-playground/sys/fs/tmpfs/tmpfs_vnops.c	Wed Feb  6 14:54:26 2013	(r246409)
+++ user/attilio/vmc-playground/sys/fs/tmpfs/tmpfs_vnops.c	Wed Feb  6 15:06:26 2013	(r246410)
@@ -511,14 +511,11 @@ tmpfs_mappedread(vm_object_t vobj, vm_ob
 	offset = addr & PAGE_MASK;
 	tlen = MIN(PAGE_SIZE - offset, len);
 
-	if (vobj == NULL)
+	if ((vobj == NULL) ||
+	    (vobj->resident_page_count == 0 && vm_object_cache_is_empty(vobj)))
 		goto nocache;
 
 	VM_OBJECT_LOCK(vobj);
-	if (vobj->resident_page_count == 0 && vm_object_cache_is_empty(vobj)) {
-		VM_OBJECT_UNLOCK(vobj);
-		goto nocache;
-	}
 lookupvpg:
 	if (((m = vm_page_lookup(vobj, idx)) != NULL) &&
 	    vm_page_is_valid(m, offset, tlen)) {
@@ -642,17 +639,14 @@ tmpfs_mappedwrite(vm_object_t vobj, vm_o
 	offset = addr & PAGE_MASK;
 	tlen = MIN(PAGE_SIZE - offset, len);
 
-	if (vobj == NULL) {
+	if ((vobj == NULL) ||
+	    (vobj->resident_page_count == 0 &&
+	    vm_object_cache_is_empty(vobj))) {
 		vpg = NULL;
 		goto nocache;
 	}
 
 	VM_OBJECT_LOCK(vobj);
-	if (vobj->resident_page_count == 0 && vm_object_cache_is_empty(vobj)) {
-		VM_OBJECT_UNLOCK(vobj);
-		vpg = NULL;
-		goto nocache;
-	}
 lookupvpg:
 	if (((vpg = vm_page_lookup(vobj, idx)) != NULL) &&
 	    vm_page_is_valid(vpg, offset, tlen)) {