From owner-svn-src-head@FreeBSD.ORG  Fri Nov 29 12:19:52 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AF70A6D5;
 Fri, 29 Nov 2013 12:19:52 +0000 (UTC)
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 9C85D12AA;
 Fri, 29 Nov 2013 12:19:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATCJqiZ026574;
 Fri, 29 Nov 2013 12:19:52 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATCJqF0026573;
 Fri, 29 Nov 2013 12:19:52 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201311291219.rATCJqF0026573@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 29 Nov 2013 12:19:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258739 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
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/options/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: Fri, 29 Nov 2013 12:19:52 -0000

Author: avg
Date: Fri Nov 29 12:19:52 2013
New Revision: 258739
URL: http://svnweb.freebsd.org/changeset/base/258739

Log:
  zfs mappedread_sf: assert that a page is never partially valid
  
  ZFS never partially validates or invalidates a page.
  The higher level VM should not do that either.
  mappedread_sf correct operation depends on a page being either fully
  valid or invalid.
  
  MFC after:	7 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Nov 29 08:22:48 2013	(r258738)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Nov 29 12:19:52 2013	(r258739)
@@ -587,8 +587,10 @@ mappedread_sf(vnode_t *vp, int nbytes, u
 				vm_page_activate(pp);
 			}
 			vm_page_unlock(pp);
-		} else
+		} else {
+			ASSERT3U(pp->valid, ==, VM_PAGE_BITS_ALL);
 			vm_page_sunbusy(pp);
+		}
 		if (error)
 			break;
 		uio->uio_resid -= bytes;