Author: avg
Date: Mon May 29 06:15:06 2017
New Revision: 319091
URL: https://svnweb.freebsd.org/changeset/base/319091
Log:
MFC r308826: zfs: fix up after the removal of PG_CACHED pages in r308691
Now that r308691 has been MFC-ed as a part of r318716,
r308826 must be MFC-ed as well.
PR: 214629
Reported by: msh...@daemon-security.com [head], lev [stable/11]
Modified:
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Mon May 29 05:23:09 2017 (r319090)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Mon May 29 06:15:06 2017 (r319091)
@@ -426,8 +426,8 @@ page_busy(vnode_t *vp, int64_t start, in
continue;
}
vm_page_sbusy(pp);
- } else {
- ASSERT(pp != NULL && !pp->valid);
+ } else if (pp != NULL) {
+ ASSERT(!pp->valid);
pp = NULL;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
