From owner-svn-src-all@FreeBSD.ORG  Thu May  2 18:36:53 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 298E5C25;
 Thu,  2 May 2013 18:36:53 +0000 (UTC) (envelope-from kib@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 1C2C81F71;
 Thu,  2 May 2013 18:36:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42Iaqmv069376;
 Thu, 2 May 2013 18:36:52 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42IaqZJ069375;
 Thu, 2 May 2013 18:36:52 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201305021836.r42IaqZJ069375@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 2 May 2013 18:36:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250188 - head/sys/fs/tmpfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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: Thu, 02 May 2013 18:36:53 -0000

Author: kib
Date: Thu May  2 18:36:52 2013
New Revision: 250188
URL: http://svnweb.freebsd.org/changeset/base/250188

Log:
  The page read or written could be wired.  Do not requeue if the page
  is not on a queue.
  
  Reported and tested by:	pho
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c	Thu May  2 18:35:12 2013	(r250187)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c	Thu May  2 18:36:52 2013	(r250188)
@@ -494,7 +494,8 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
 	vm_page_unhold(m);
 	vm_page_deactivate(m);
 	/* Requeue to maintain LRU ordering. */
-	vm_page_requeue(m);
+	if (m->queue != PQ_NONE)
+		vm_page_requeue(m);
 	vm_page_unlock(m);
 	VM_OBJECT_WUNLOCK(tobj);
 
@@ -609,7 +610,8 @@ tmpfs_mappedwrite(vm_object_t tobj, size
 	vm_page_unhold(tpg);
 	vm_page_deactivate(tpg);
 	/* Requeue to maintain LRU ordering. */
-	vm_page_requeue(tpg);
+	if (tpg->queue != PQ_NONE)
+		vm_page_requeue(tpg);
 	vm_page_unlock(tpg);
 	VM_OBJECT_WUNLOCK(tobj);