Author: avg
Date: Sat Nov 19 08:12:57 2016
New Revision: 308826
URL: https://svnweb.freebsd.org/changeset/base/308826

Log:
  zfs: fix up after the removal of PG_CACHED pages in r308691
  
  PR:           214629
  Reported by:  [email protected]
  Reviewed by:  alc
  Tested by:    Shawn Webb <[email protected]>
  X-MFC with:   308691

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     Sat Nov 
19 07:28:00 2016        (r308825)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c     Sat Nov 
19 08:12:57 2016        (r308826)
@@ -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;
                }
 
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to