svn commit: r253286 - user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Attilio Rao]

Author: attilio
Date: Fri Jul 12 21:24:10 2013
New Revision: 253286
URL: http://svnweb.freebsd.org/changeset/base/253286

Log:
  MFC

Modified:
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Jul 12 21:21:15 2013	(r253285)
+++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Jul 12 21:24:10 2013	(r253286)
@@ -511,8 +511,7 @@ mappedread_sf(vnode_t *vp, int nbytes, u
 			vm_page_busy_runlock(pp);
 			vm_page_lock(pp);
 			if (error) {
-				if (pp->wire_count == 0 && pp->valid == 0 &&
-				    pp->busy == 0 && !(pp->oflags & VPO_BUSY))
+				if (pp->wire_count == 0 && pp->valid == 0 &&					    !vm_page_busy_locked(pp))
 					vm_page_free(pp);
 			} else {
 				pp->valid = VM_PAGE_BITS_ALL;