From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 21 06:57:32 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6BD2FB3F;
 Mon, 21 Jan 2013 06:57:32 +0000 (UTC)
 (envelope-from bryanv@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 48D2CE1A;
 Mon, 21 Jan 2013 06:57:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L6vWor097900;
 Mon, 21 Jan 2013 06:57:32 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L6vWLQ097899;
 Mon, 21 Jan 2013 06:57:32 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201301210657.r0L6vWLQ097899@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Mon, 21 Jan 2013 06:57:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245720 - projects/virtio/sys/dev/virtio/balloon
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jan 2013 06:57:32 -0000

Author: bryanv
Date: Mon Jan 21 06:57:31 2013
New Revision: 245720
URL: http://svnweb.freebsd.org/changeset/base/245720

Log:
  virtio_balloon: Simplify lowmem handling in vtballoon_inflate()
  
  Approved by:	grehan (implicit)

Modified:
  projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c

Modified: projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c
==============================================================================
--- projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c	Mon Jan 21 06:55:51 2013	(r245719)
+++ projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c	Mon Jan 21 06:57:31 2013	(r245720)
@@ -319,14 +319,15 @@ vtballoon_inflate(struct vtballoon_softc
 	int i;
 
 	vq = sc->vtballoon_inflate_vq;
-	m = NULL;
 
 	if (npages > VTBALLOON_PAGES_PER_REQUEST)
 		npages = VTBALLOON_PAGES_PER_REQUEST;
 
 	for (i = 0; i < npages; i++) {
-		if ((m = vtballoon_alloc_page(sc)) == NULL)
+		if ((m = vtballoon_alloc_page(sc)) == NULL) {
+			sc->vtballoon_timeout = VTBALLOON_LOWMEM_TIMEOUT;
 			break;
+		}
 
 		sc->vtballoon_page_frames[i] =
 		    VM_PAGE_TO_PHYS(m) >> VIRTIO_BALLOON_PFN_SHIFT;
@@ -338,9 +339,6 @@ vtballoon_inflate(struct vtballoon_softc
 
 	if (i > 0)
 		vtballoon_send_page_frames(sc, vq, i);
-
-	if (m == NULL)
-		sc->vtballoon_timeout = VTBALLOON_LOWMEM_TIMEOUT;
 }
 
 static void