Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 May 2014 17:47:49 +0000 (UTC)
From:      Alan Cox <alc@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r266591 - stable/10/sys/vm
Message-ID:  <201405231747.s4NHlnKr062310@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: alc
Date: Fri May 23 17:47:49 2014
New Revision: 266591
URL: http://svnweb.freebsd.org/changeset/base/266591

Log:
  MFC r259107
    Eliminate a redundant parameter to vm_radix_replace().
  
    Improve the wording of the comment describing vm_radix_replace().

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

Modified: stable/10/sys/vm/vm_page.c
==============================================================================
--- stable/10/sys/vm/vm_page.c	Fri May 23 17:46:00 2014	(r266590)
+++ stable/10/sys/vm/vm_page.c	Fri May 23 17:47:49 2014	(r266591)
@@ -1200,7 +1200,7 @@ vm_page_replace(vm_page_t mnew, vm_objec
 
 	mnew->object = object;
 	mnew->pindex = pindex;
-	mold = vm_radix_replace(&object->rtree, mnew, pindex);
+	mold = vm_radix_replace(&object->rtree, mnew);
 	KASSERT(mold->queue == PQ_NONE,
 	    ("vm_page_replace: mold is on a paging queue"));
 

Modified: stable/10/sys/vm/vm_radix.c
==============================================================================
--- stable/10/sys/vm/vm_radix.c	Fri May 23 17:46:00 2014	(r266590)
+++ stable/10/sys/vm/vm_radix.c	Fri May 23 17:47:49 2014	(r266591)
@@ -788,20 +788,18 @@ vm_radix_reclaim_allnodes(struct vm_radi
 }
 
 /*
- * Replace an existing page into the trie with another one.
- * Panics if the replacing page is not present or if the new page has an
- * invalid key.
+ * Replace an existing page in the trie with another one.
+ * Panics if there is not an old page in the trie at the new page's index.
  */
 vm_page_t
-vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage, vm_pindex_t index)
+vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage)
 {
 	struct vm_radix_node *rnode;
 	vm_page_t m;
+	vm_pindex_t index;
 	int slot;
 
-	KASSERT(newpage->pindex == index, ("%s: newpage index invalid",
-	    __func__));
-
+	index = newpage->pindex;
 	rnode = vm_radix_getroot(rtree);
 	if (rnode == NULL)
 		panic("%s: replacing page on an empty trie", __func__);

Modified: stable/10/sys/vm/vm_radix.h
==============================================================================
--- stable/10/sys/vm/vm_radix.h	Fri May 23 17:46:00 2014	(r266590)
+++ stable/10/sys/vm/vm_radix.h	Fri May 23 17:47:49 2014	(r266591)
@@ -43,8 +43,7 @@ vm_page_t	vm_radix_lookup_ge(struct vm_r
 vm_page_t	vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index);
 void		vm_radix_reclaim_allnodes(struct vm_radix *rtree);
 void		vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index);
-vm_page_t	vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage,
-		    vm_pindex_t index);
+vm_page_t	vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage);
 
 #endif /* _KERNEL */
 #endif /* !_VM_RADIX_H_ */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405231747.s4NHlnKr062310>