From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [patch 2/2] xen-gntdev: unlock on error path in gntdev_mmap() Date: Fri, 25 Mar 2011 11:04:10 -0400 Message-ID: <20110325150410.GF27651@dumpdata.com> References: <20110319054543.GE2008@bicker> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20110319054543.GE2008@bicker> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Dan Carpenter Cc: Jeremy Fitzhardinge , kernel-janitors@vger.kernel.org, xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org List-Id: xen-devel@lists.xenproject.org On Sat, Mar 19, 2011 at 08:45:43AM +0300, Dan Carpenter wrote: > We should unlock here and also decrement the number of &map->users. > > Signed-off-by: Dan Carpenter > --- > I'm not very familiar with this code. Please review carefully. It looks right. -EINVAL is still returned so that is OK. Put it on the rc1 train. > > diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c > index 017ce60..b0f9e8f 100644 > --- a/drivers/xen/gntdev.c > +++ b/drivers/xen/gntdev.c > @@ -662,7 +662,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) > if (map->flags) { > if ((vma->vm_flags & VM_WRITE) && > (map->flags & GNTMAP_readonly)) > - return -EINVAL; > + goto out_unlock_put; > } else { > map->flags = GNTMAP_host_map; > if (!(vma->vm_flags & VM_WRITE)) > @@ -700,6 +700,8 @@ unlock_out: > spin_unlock(&priv->lock); > return err; > > +out_unlock_put: > + spin_unlock(&priv->lock); > out_put_map: > if (use_ptemod) > map->vma = NULL; > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel