svn commit: r251032 - user/attilio/vmobj-readlock/sys/kern

[Attilio Rao]

Author: attilio
Date: Mon May 27 16:29:53 2013
New Revision: 251032
URL: http://svnweb.freebsd.org/changeset/base/251032

Log:
  Fix brain-o.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/kern/uipc_shm.c

Modified: user/attilio/vmobj-readlock/sys/kern/uipc_shm.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/kern/uipc_shm.c	Mon May 27 16:23:48 2013	(r251031)
+++ user/attilio/vmobj-readlock/sys/kern/uipc_shm.c	Mon May 27 16:29:53 2013	(r251032)
@@ -280,9 +280,10 @@ shm_dotruncate(struct shmfd *shmfd, off_
 			idx = OFF_TO_IDX(length);
 retry:
 			m = vm_page_lookup(object, idx);
-			if (m != NULL && vm_page_sleep_if_busy(m, "shmtrc"))
-				goto retry;
-			else if (vm_pager_has_page(object, idx, NULL, NULL)) {
+			if (m != NULL) {
+				if (vm_page_sleep_if_busy(m, "shmtrc"))
+					goto retry;
+			} else if (vm_pager_has_page(object, idx, NULL, NULL)) {
 				m = vm_page_alloc(object, idx, VM_ALLOC_NORMAL);
 				if (m == NULL) {
 					VM_OBJECT_WUNLOCK(object);