Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753354Ab2KLORL (ORCPT ); Mon, 12 Nov 2012 09:17:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52151 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556Ab2KLORK (ORCPT ); Mon, 12 Nov 2012 09:17:10 -0500 Date: Mon, 12 Nov 2012 12:16:54 -0200 From: Rafael Aquini To: Wei Yongjun Cc: akpm@linux-foundation.org, rusty@rustcorp.com.au, mst@redhat.com, yongjun_wei@trendmicro.com.cn, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -next] virtio: balloon: fix missing unlock on error in fill_balloon() Message-ID: <20121112141653.GA7228@optiplex.redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1484 Lines: 47 On Mon, Nov 12, 2012 at 09:50:40PM +0800, Wei Yongjun wrote: > From: Wei Yongjun > > Add the missing unlock before return from function fill_balloon() > in the error handling case. > > Introduced by 9864a8(virtio_balloon: introduce migration primitives > to balloon pages) > > dpatch engine is used to auto generate this patch. > (https://github.com/weiyj/dpatch) > > Signed-off-by: Wei Yongjun > --- > drivers/virtio/virtio_balloon.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index f70151b..72e8dcb 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -152,8 +152,10 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num) > } > > /* Didn't get any? Oh well. */ > - if (vb->num_pfns == 0) > + if (vb->num_pfns == 0) { > + mutex_unlock(&vb->balloon_lock); > return; > + } > > tell_host(vb, vb->inflate_vq); > mutex_unlock(&vb->balloon_lock); > I missed that one when rewriting v10 to v11. :( Good catch, Wei! thanks! Andrew, we need this pick for the virtio_balloon v12 patch, as well. -- Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/