From owner-svn-src-user@FreeBSD.ORG  Mon May 27 16:29:54 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 61EFB500;
 Mon, 27 May 2013 16:29:54 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 54CFAD62;
 Mon, 27 May 2013 16:29:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RGTsbO065935;
 Mon, 27 May 2013 16:29:54 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RGTsYN065934;
 Mon, 27 May 2013 16:29:54 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201305271629.r4RGTsYN065934@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 27 May 2013 16:29:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r251032 - user/attilio/vmobj-readlock/sys/kern
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 16:29:54 -0000

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);