svn commit: r260775 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Thu Jan 16 16:13:44 2014
New Revision: 260775
URL: http://svnweb.freebsd.org/changeset/base/260775

Log:
  MFC r258739: zfs mappedread_sf: assert that a page is never partially valid

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Thu Jan 16 16:13:32 2014	(r260774)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Thu Jan 16 16:13:44 2014	(r260775)
@@ -567,7 +567,8 @@ again:
 				pp->valid = VM_PAGE_BITS_ALL;
 				vm_page_activate(pp);
 			}
-			vm_page_unlock_queues();
+		} else {
+			ASSERT3U(pp->valid, ==, VM_PAGE_BITS_ALL);
 		}
 		if (error)
 			break;