summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2014-01-16 16:13:21 +0000
committeravg <avg@FreeBSD.org>2014-01-16 16:13:21 +0000
commitf06ee197d04358d8251153c415df32f0d899467d (patch)
tree9090983c5f3b1ba674844b26ee4d3bc2d4fc0e9b
parent9446d15bf5046f6c425276f6112eb416f13214a0 (diff)
downloadFreeBSD-src-f06ee197d04358d8251153c415df32f0d899467d.zip
FreeBSD-src-f06ee197d04358d8251153c415df32f0d899467d.tar.gz
MFC r258739: zfs mappedread_sf: assert that a page is never partially valid
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index d3a3ab4..743611e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -580,8 +580,10 @@ mappedread_sf(vnode_t *vp, int nbytes, uio_t *uio)
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;
OpenPOWER on IntegriCloud