From owner-svn-src-head@FreeBSD.ORG  Thu May  6 15:52:08 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CE8F21065675;
	Thu,  6 May 2010 15:52:08 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id BF16D8FC12;
	Thu,  6 May 2010 15:52:08 +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 o46Fq8fD019246;
	Thu, 6 May 2010 15:52:08 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46Fq809019245;
	Thu, 6 May 2010 15:52:08 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201005061552.o46Fq809019245@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Thu, 6 May 2010 15:52:08 +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: r207700 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 May 2010 15:52:08 -0000

Author: alc
Date: Thu May  6 15:52:08 2010
New Revision: 207700
URL: http://svn.freebsd.org/changeset/base/207700

Log:
  Eliminate a small bit of unneeded code from kern_sendfile(): While
  kern_sendfile() is running, the file's vm object can't be destroyed
  because kern_sendfile() increments the vm object's reference count.  (Once
  kern_sendfile() decrements the reference count and returns, the vm object
  can, however, be destroyed.  So, sf_buf_mext() must handle the case where
  the vm object is destroyed.)
  
  Reviewed by:	kib

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c	Thu May  6 12:37:01 2010	(r207699)
+++ head/sys/kern/uipc_syscalls.c	Thu May  6 15:52:08 2010	(r207700)
@@ -2139,14 +2139,9 @@ retry_space:
 			    (mnw ? SFB_NOWAIT : SFB_CATCH))) == NULL) {
 				mbstat.sf_allocfail++;
 				vm_page_lock(pg);
-				vm_page_lock_queues();
 				vm_page_unwire(pg, 0);
-				/*
-				 * XXX: Not same check as above!?
-				 */
-				if (pg->wire_count == 0 && pg->object == NULL)
-					vm_page_free(pg);
-				vm_page_unlock_queues();
+				KASSERT(pg->object != NULL,
+				    ("kern_sendfile: object disappeared"));
 				vm_page_unlock(pg);
 				error = (mnw ? EAGAIN : EINTR);
 				break;