From owner-svn-src-all@FreeBSD.ORG  Tue Sep 17 06:37:22 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5187AD08;
 Tue, 17 Sep 2013 06:37:22 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3EE6C2E26;
 Tue, 17 Sep 2013 06:37:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H6bMML024420;
 Tue, 17 Sep 2013 06:37:22 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H6bMUV024417;
 Tue, 17 Sep 2013 06:37:22 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201309170637.r8H6bMUV024417@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 17 Sep 2013 06:37:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255625 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Sep 2013 06:37:22 -0000

Author: glebius
Date: Tue Sep 17 06:37:21 2013
New Revision: 255625
URL: http://svnweb.freebsd.org/changeset/base/255625

Log:
    Fix assertion in sendfile_readpage() to assert only the validity
  of requested amount of data in a page. Move assertion down below
  object unlock.
  
  Approved by:	re (kib)
  Sponsored by:	Nginx, Inc.
  Sponsored by:	Netflix

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c	Tue Sep 17 04:24:34 2013	(r255624)
+++ head/sys/kern/uipc_syscalls.c	Tue Sep 17 06:37:21 2013	(r255625)
@@ -2076,10 +2076,10 @@ free_page:
 			vm_page_free(m);
 		vm_page_unlock(m);
 	}
-	VM_OBJECT_WUNLOCK(obj);
-	KASSERT(error != 0 || (m->wire_count > 0 && m->valid ==
-	    VM_PAGE_BITS_ALL),
+	KASSERT(error != 0 || (m->wire_count > 0 &&
+	    vm_page_is_valid(m, off & PAGE_MASK, xfsize)),
 	    ("wrong page state m %p", m));
+	VM_OBJECT_WUNLOCK(obj);
 	return (error);
 }