svn commit: r355471 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Mark Johnston markj at FreeBSD.org
Fri Dec 6 23:49:38 UTC 2019


Author: markj
Date: Fri Dec  6 23:49:37 2019
New Revision: 355471
URL: https://svnweb.freebsd.org/changeset/base/355471

Log:
  Fix an inverted condition introduced in r353539.
  
  This would have most likely resulted in read errors causing page leaks.
  
  Submitted by:	jeff

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 Dec  6 23:39:38 2019	(r355470)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Dec  6 23:49:37 2019	(r355471)
@@ -550,7 +550,7 @@ mappedread_sf(vnode_t *vp, int nbytes, uio_t *uio)
 				vm_page_unlock(pp);
 			}
 			vm_page_sunbusy(pp);
-			if (error != 0 && !vm_page_wired(pp) == 0 &&
+			if (error != 0 && !vm_page_wired(pp) &&
 			    pp->valid == 0 && vm_page_tryxbusy(pp))
 				vm_page_free(pp);
 		} else {


More information about the svn-src-all mailing list