svn commit: r302922 - stable/10/sys/vm

[Mark Johnston]

Author: markj
Date: Sat Jul 16 02:47:56 2016
New Revision: 302922
URL: https://svnweb.freebsd.org/changeset/base/302922

Log:
  MFC r301210:
  Don't preserve the page's object linkage in vm_page_insert_after().

Modified:
  stable/10/sys/vm/vm_page.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_page.c
==============================================================================
--- stable/10/sys/vm/vm_page.c	Sat Jul 16 00:54:46 2016	(r302921)
+++ stable/10/sys/vm/vm_page.c	Sat Jul 16 02:47:56 2016	(r302922)
@@ -981,8 +981,6 @@ static int
 vm_page_insert_after(vm_page_t m, vm_object_t object, vm_pindex_t pindex,
     vm_page_t mpred)
 {
-	vm_pindex_t sidx;
-	vm_object_t sobj;
 	vm_page_t msucc;
 
 	VM_OBJECT_ASSERT_WLOCKED(object);
@@ -1003,8 +1001,6 @@ vm_page_insert_after(vm_page_t m, vm_obj
 	/*
 	 * Record the object/offset pair in this page
 	 */
-	sobj = m->object;
-	sidx = m->pindex;
 	m->object = object;
 	m->pindex = pindex;
 
@@ -1012,8 +1008,8 @@ vm_page_insert_after(vm_page_t m, vm_obj
 	 * Now link into the object's ordered list of backed pages.
 	 */
 	if (vm_radix_insert(&object->rtree, m)) {
-		m->object = sobj;
-		m->pindex = sidx;
+		m->object = NULL;
+		m->pindex = 0;
 		return (1);
 	}
 	vm_page_insert_radixdone(m, object, mpred);