svn commit: r250188 - head/sys/fs/tmpfs

[Konstantin Belousov]

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);