From owner-svn-src-user@FreeBSD.ORG  Thu May 23 01:37:35 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 55EBE6AF;
 Thu, 23 May 2013 01:37:35 +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 48D417EA;
 Thu, 23 May 2013 01:37:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4N1bY14061798;
 Thu, 23 May 2013 01:37:34 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4N1bYll061797;
 Thu, 23 May 2013 01:37:34 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201305230137.r4N1bYll061797@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 23 May 2013 01:37:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r250925 - user/attilio/vmobj-readlock/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: Thu, 23 May 2013 01:37:35 -0000

Author: attilio
Date: Thu May 23 01:37:34 2013
New Revision: 250925
URL: http://svnweb.freebsd.org/changeset/base/250925

Log:
  Fix-up tmpfs
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c

Modified: user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c	Thu May 23 00:58:56 2013	(r250924)
+++ user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c	Thu May 23 01:37:34 2013	(r250925)
@@ -486,7 +486,7 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
 	}
 	vm_page_lock(m);
 	vm_page_hold(m);
-	vm_page_wakeup(m);
+	vm_page_wakeup_locked(m);
 	vm_page_unlock(m);
 	VM_OBJECT_WUNLOCK(tobj);
 	error = uiomove_fromphys(&m, offset, tlen, uio);
@@ -499,7 +499,6 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
 		/* Requeue to maintain LRU ordering. */
 		vm_page_requeue(m);
 	}
-	vm_page_wakeup_locked(m);
 	vm_page_unlock(m);
 	VM_OBJECT_WUNLOCK(tobj);
 
@@ -603,7 +602,7 @@ tmpfs_mappedwrite(vm_object_t tobj, size
 	}
 	vm_page_lock(tpg);
 	vm_page_hold(tpg);
-	vm_page_wakeup(tpg);
+	vm_page_wakeup_locked(tpg);
 	vm_page_unlock(tpg);
 	VM_OBJECT_WUNLOCK(tobj);
 	error = uiomove_fromphys(&tpg, offset, tlen, uio);
@@ -618,7 +617,6 @@ tmpfs_mappedwrite(vm_object_t tobj, size
 		/* Requeue to maintain LRU ordering. */
 		vm_page_requeue(tpg);
 	}
-	vm_page_wakeup_locked(tpg);
 	vm_page_unlock(tpg);
 	VM_OBJECT_WUNLOCK(tobj);