svn commit: r254192 - in user/attilio/vmobj-readlock/sys: cddl/contrib/opensolaris/uts/common/fs/zfs kern vm

[Attilio Rao]

Author: attilio
Date: Sat Aug 10 21:11:17 2013
New Revision: 254192
URL: http://svnweb.freebsd.org/changeset/base/254192

Log:
  Fix mismerge.

Modified:
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/attilio/vmobj-readlock/sys/kern/vfs_bio.c
  user/attilio/vmobj-readlock/sys/vm/vm_page.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	Sat Aug 10 20:54:15 2013	(r254191)
+++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Aug 10 21:11:17 2013	(r254192)
@@ -336,7 +336,7 @@ page_busy(vnode_t *vp, int64_t start, in
 		if ((pp = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
 		    pp->valid) {
 			if (vm_page_sleep_if_busy(pp, "zfsmwb",
-			    VM_ALLOC_RBUSY, TRUE))
+			    VM_ALLOC_SBUSY, TRUE))
 				continue;
 		} else if (pp == NULL) {
 			pp = vm_page_alloc(obj, OFF_TO_IDX(start),
@@ -526,7 +526,7 @@ mappedread_sf(vnode_t *vp, int nbytes, u
 	for (start = uio->uio_loffset; len > 0; start += PAGESIZE) {
 		int bytes = MIN(PAGESIZE, len);
 
-		pp = vm_page_grab(obj, OFF_TO_IDX(start), VM_ALLOC_RBUSY |
+		pp = vm_page_grab(obj, OFF_TO_IDX(start), VM_ALLOC_SBUSY |
 		    VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 		if (pp->valid == 0) {
 			zfs_vmobject_runlock(obj);

Modified: user/attilio/vmobj-readlock/sys/kern/vfs_bio.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/kern/vfs_bio.c	Sat Aug 10 20:54:15 2013	(r254191)
+++ user/attilio/vmobj-readlock/sys/kern/vfs_bio.c	Sat Aug 10 21:11:17 2013	(r254192)
@@ -3451,7 +3451,7 @@ allocbuf(struct buf *bp, int size)
 					vm_page_lock(m);
 					vm_page_unwire(m, 0);
 					vm_page_unlock(m);
-					vm_page_busy_wunlock(m);
+					vm_page_xunbusy(m);
 				}
 				VM_OBJECT_RUNLOCK(bp->b_bufobj->bo_object);
 				bp->b_npages = desiredpages;
@@ -3490,7 +3490,7 @@ allocbuf(struct buf *bp, int size)
 				 * pages are vfs_busy_pages().
 				 */
 				m = vm_page_grab(obj, OFF_TO_IDX(bp->b_offset) +
-				    bp->b_npages, VM_ALLOC_RBUSY |
+				    bp->b_npages, VM_ALLOC_SBUSY |
 				    VM_ALLOC_SYSTEM | VM_ALLOC_WIRED |
 				    VM_ALLOC_RETRY |
 				    VM_ALLOC_COUNT(desiredpages - bp->b_npages));
@@ -3541,7 +3541,7 @@ allocbuf(struct buf *bp, int size)
 				vm_page_t m;
 
 				m = bp->b_pages[onpages];
-				vm_page_busy_runlock(m);
+				vm_page_sunbusy(m);
 				++onpages;
 			}
 			VM_OBJECT_RUNLOCK(obj);

Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_page.c	Sat Aug 10 20:54:15 2013	(r254191)
+++ user/attilio/vmobj-readlock/sys/vm/vm_page.c	Sat Aug 10 21:11:17 2013	(r254192)
@@ -897,11 +897,11 @@ vm_page_sleep_if_busy(vm_page_t m, const
 	    ("vm_page_sleep_if_busy: VM_ALLOC_NOBUSY with read object lock"));
 
 	if ((busyflags & VM_ALLOC_NOBUSY) != 0) {
-		cond = vm_page_busy_locked(m);
-	} else if ((busyflags & VM_ALLOC_RBUSY) != 0)
-		cond = !vm_page_busy_tryrlock(m);
+		cond = vm_page_busied(m);
+	} else if ((busyflags & VM_ALLOC_SBUSY) != 0)
+		cond = !vm_page_trysbusy(m);
 	else
-		cond = !vm_page_busy_trywlock(m);
+		cond = !vm_page_tryxbusy(m);
 	if (cond) {
 
 		/*
@@ -2728,7 +2728,7 @@ vm_page_grab(vm_object_t object, vm_pind
 retrylookup:
 	if ((m = vm_page_lookup(object, pindex)) != NULL) {
 		if (vm_page_sleep_if_busy(m, "pgrbwt", allocflags &
-		    (VM_ALLOC_NOBUSY | VM_ALLOC_RBUSY), TRUE))
+		    (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY), TRUE))
 			goto retrylookup;
 		else {
 			if ((allocflags & VM_ALLOC_WIRED) != 0) {