svn commit: r255625 - head/sys/kern

[Gleb Smirnoff]

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);
 }