From owner-svn-src-all@FreeBSD.ORG Wed Jun 30 17:20:33 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B2C5106566B; Wed, 30 Jun 2010 17:20:33 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B3588FC16; Wed, 30 Jun 2010 17:20:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5UHKXRN010508; Wed, 30 Jun 2010 17:20:33 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5UHKXlm010506; Wed, 30 Jun 2010 17:20:33 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201006301720.o5UHKXlm010506@svn.freebsd.org> From: Alan Cox Date: Wed, 30 Jun 2010 17:20:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209610 - head/sys/vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2010 17:20:33 -0000 Author: alc Date: Wed Jun 30 17:20:33 2010 New Revision: 209610 URL: http://svn.freebsd.org/changeset/base/209610 Log: Simplify entry to vm_pageout_clean(). Expect the page to be locked. Previously, the caller unlocked the page, and vm_pageout_clean() immediately reacquired the page lock. Also, assert rather than test that the page is neither busy nor held. Since vm_pageout_clean() is called with the object and page locked, the page can't have changed state since the caller verified that the page is neither busy nor held. Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Wed Jun 30 16:28:28 2010 (r209609) +++ head/sys/vm/vm_pageout.c Wed Jun 30 17:20:33 2010 (r209610) @@ -325,8 +325,7 @@ vm_pageout_clean(vm_page_t m) int ib, is, page_base; vm_pindex_t pindex = m->pindex; - vm_page_lock_assert(m, MA_NOTOWNED); - vm_page_lock(m); + vm_page_lock_assert(m, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); /* @@ -341,11 +340,9 @@ vm_pageout_clean(vm_page_t m) /* * Can't clean the page if it's busy or held. */ - if ((m->hold_count != 0) || - ((m->busy != 0) || (m->oflags & VPO_BUSY))) { - vm_page_unlock(m); - return 0; - } + KASSERT(m->busy == 0 && (m->oflags & VPO_BUSY) == 0, + ("vm_pageout_clean: page %p is busy", m)); + KASSERT(m->hold_count == 0, ("vm_pageout_clean: page %p is held", m)); mc[vm_pageout_page_count] = pb = ps = m; pageout_count = 1; @@ -1060,7 +1057,6 @@ rescan0: goto unlock_and_continue; } } - vm_page_unlock(m); /* * If a page is dirty, then it is either being washed