From owner-svn-src-user@FreeBSD.ORG Sat Feb 23 19:28:32 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A102E4C0; Sat, 23 Feb 2013 19:28:32 +0000 (UTC) (envelope-from alc@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 7BA30E92; Sat, 23 Feb 2013 19:28:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1NJSWNZ021922; Sat, 23 Feb 2013 19:28:32 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1NJSWRO021920; Sat, 23 Feb 2013 19:28:32 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201302231928.r1NJSWRO021920@svn.freebsd.org> From: Alan Cox Date: Sat, 23 Feb 2013 19:28:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r247198 - user/attilio/vmc-playground/sys/vm 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 19:28:32 -0000 Author: alc Date: Sat Feb 23 19:28:31 2013 New Revision: 247198 URL: http://svnweb.freebsd.org/changeset/base/247198 Log: Correctly assert that no page already exists at the offset within the object that is currently being allocated. Sponsored by: EMC / Isilon Storage Division Modified: user/attilio/vmc-playground/sys/vm/vm_reserv.c Modified: user/attilio/vmc-playground/sys/vm/vm_reserv.c ============================================================================== --- user/attilio/vmc-playground/sys/vm/vm_reserv.c Sat Feb 23 19:27:53 2013 (r247197) +++ user/attilio/vmc-playground/sys/vm/vm_reserv.c Sat Feb 23 19:28:31 2013 (r247198) @@ -344,7 +344,7 @@ vm_reserv_alloc_contig(vm_object_t objec */ mpred = vm_radix_lookup_le(&object->rtree, pindex); if (mpred != NULL) { - KASSERT(mpred->pindex <= pindex, + KASSERT(mpred->pindex < pindex, ("vm_reserv_alloc_contig: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -352,7 +352,7 @@ vm_reserv_alloc_contig(vm_object_t objec } msucc = vm_radix_lookup_ge(&object->rtree, pindex); if (msucc != NULL) { - KASSERT(msucc->pindex >= pindex, + KASSERT(msucc->pindex > pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(msucc); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -498,7 +498,7 @@ vm_reserv_alloc_page(vm_object_t object, */ mpred = vm_radix_lookup_le(&object->rtree, pindex); if (mpred != NULL) { - KASSERT(mpred->pindex <= pindex, + KASSERT(mpred->pindex < pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -506,7 +506,7 @@ vm_reserv_alloc_page(vm_object_t object, } msucc = vm_radix_lookup_ge(&object->rtree, pindex); if (msucc != NULL) { - KASSERT(msucc->pindex >= pindex, + KASSERT(msucc->pindex > pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(msucc); if (rv->object == object && vm_reserv_has_pindex(rv, pindex))