Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753559AbXIZGSO (ORCPT ); Wed, 26 Sep 2007 02:18:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750788AbXIZGR7 (ORCPT ); Wed, 26 Sep 2007 02:17:59 -0400 Received: from brick.kernel.dk ([87.55.233.238]:11875 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750787AbXIZGR7 (ORCPT ); Wed, 26 Sep 2007 02:17:59 -0400 Date: Wed, 26 Sep 2007 08:19:26 +0200 From: Jens Axboe To: Al Viro Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] cdrom_open() forgets to unlock on -EROFS failure exits Message-ID: <20070926061926.GF2367@kernel.dk> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1014 Lines: 35 On Wed, Sep 26 2007, Al Viro wrote: > > Signed-off-by: Al Viro > --- > drivers/cdrom/cdrom.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index 67ee3d4..7924571 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -1032,6 +1032,10 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp) > check_disk_change(ip->i_bdev); > return 0; > err_release: > + if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) { > + cdi->ops->lock_door(cdi, 0); > + cdinfo(CD_OPEN, "door unlocked.\n"); > + } > cdi->ops->release(cdi); > err: > cdi->use_count--; > -- > 1.5.3.GIT Looks good Al, applied. -- Jens Axboe - 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/