svn commit: r247299 - user/attilio/vmobj-rwlock/sys/vm

[Attilio Rao]

Author: attilio
Date: Tue Feb 26 01:38:12 2013
New Revision: 247299
URL: http://svnweb.freebsd.org/changeset/base/247299

Log:
  As VM_OBJECT_SLEEP() is a vm_object_t specific function, make
  the passed object as the first argument of the function for consistency.
  
  Sponsored by:	EMC / Isilon storage revision

Modified:
  user/attilio/vmobj-rwlock/sys/vm/swap_pager.c
  user/attilio/vmobj-rwlock/sys/vm/vm_object.c
  user/attilio/vmobj-rwlock/sys/vm/vm_object.h
  user/attilio/vmobj-rwlock/sys/vm/vm_page.c

Modified: user/attilio/vmobj-rwlock/sys/vm/swap_pager.c
==============================================================================
--- user/attilio/vmobj-rwlock/sys/vm/swap_pager.c	Tue Feb 26 01:05:25 2013	(r247298)
+++ user/attilio/vmobj-rwlock/sys/vm/swap_pager.c	Tue Feb 26 01:38:12 2013	(r247299)
@@ -1214,7 +1214,7 @@ swap_pager_getpages(vm_object_t object, 
 	while ((mreq->oflags & VPO_SWAPINPROG) != 0) {
 		mreq->oflags |= VPO_WANTED;
 		PCPU_INC(cnt.v_intrans);
-		if (VM_OBJECT_SLEEP(mreq, object, PSWP, "swread", hz * 20)) {
+		if (VM_OBJECT_SLEEP(object, mreq, PSWP, "swread", hz * 20)) {
 			printf(
 "swap_pager: indefinite wait buffer: bufobj: %p, blkno: %jd, size: %ld\n",
 			    bp->b_bufobj, (intmax_t)bp->b_blkno, bp->b_bcount);

Modified: user/attilio/vmobj-rwlock/sys/vm/vm_object.c
==============================================================================
--- user/attilio/vmobj-rwlock/sys/vm/vm_object.c	Tue Feb 26 01:05:25 2013	(r247298)
+++ user/attilio/vmobj-rwlock/sys/vm/vm_object.c	Tue Feb 26 01:38:12 2013	(r247299)
@@ -1139,7 +1139,7 @@ shadowlookup:
 			if (object != tobject)
 				VM_OBJECT_WUNLOCK(object);
 			m->oflags |= VPO_WANTED;
-			VM_OBJECT_SLEEP(m, tobject, PDROP | PVM, "madvpo" , 0);
+			VM_OBJECT_SLEEP(tobject, m, PDROP | PVM, "madvpo" , 0);
 			VM_OBJECT_WLOCK(object);
   			goto relookup;
 		}
@@ -1337,7 +1337,7 @@ retry:
 		if ((m->oflags & VPO_BUSY) || m->busy) {
 			VM_OBJECT_WUNLOCK(new_object);
 			m->oflags |= VPO_WANTED;
-			VM_OBJECT_SLEEP(m, orig_object, PVM, "spltwt" , 0);
+			VM_OBJECT_SLEEP(orig_object, m, PVM, "spltwt" , 0);
 			VM_OBJECT_WLOCK(new_object);
 			goto retry;
 		}
@@ -1495,7 +1495,7 @@ vm_object_backing_scan(vm_object_t objec
 				if ((p->oflags & VPO_BUSY) || p->busy) {
 					VM_OBJECT_WUNLOCK(object);
 					p->oflags |= VPO_WANTED;
-					VM_OBJECT_SLEEP(p, backing_object,
+					VM_OBJECT_SLEEP(backing_object, p,
 					    PDROP | PVM, "vmocol", 0);
 					VM_OBJECT_WLOCK(object);
 					VM_OBJECT_WLOCK(backing_object);

Modified: user/attilio/vmobj-rwlock/sys/vm/vm_object.h
==============================================================================
--- user/attilio/vmobj-rwlock/sys/vm/vm_object.h	Tue Feb 26 01:05:25 2013	(r247298)
+++ user/attilio/vmobj-rwlock/sys/vm/vm_object.h	Tue Feb 26 01:38:12 2013	(r247299)
@@ -216,7 +216,7 @@ extern struct vm_object kmem_object_stor
 	rw_rlock(&(object)->lock)
 #define	VM_OBJECT_RUNLOCK(object)					\
 	rw_runlock(&(object)->lock)
-#define	VM_OBJECT_SLEEP(wchan, object, pri, wmesg, timo)		\
+#define	VM_OBJECT_SLEEP(object, wchan, pri, wmesg, timo)		\
 	rw_sleep((wchan), &(object)->lock, (pri), (wmesg), (timo))
 #define	VM_OBJECT_TRYRLOCK(object)					\
 	rw_try_rlock(&(object)->lock)

Modified: user/attilio/vmobj-rwlock/sys/vm/vm_page.c
==============================================================================
--- user/attilio/vmobj-rwlock/sys/vm/vm_page.c	Tue Feb 26 01:05:25 2013	(r247298)
+++ user/attilio/vmobj-rwlock/sys/vm/vm_page.c	Tue Feb 26 01:38:12 2013	(r247299)
@@ -764,7 +764,7 @@ vm_page_sleep(vm_page_t m, const char *m
 	 * it.
 	 */
 	m->oflags |= VPO_WANTED;
-	VM_OBJECT_SLEEP(m, m->object, PVM, msg, 0);
+	VM_OBJECT_SLEEP(m->object, m, PVM, msg, 0);
 }
 
 /*