Re: [PATCH] cdrom_open() forgets to unlock on -EROFS failure exits

[Jens Axboe]

On Wed, Sep 26 2007, Al Viro wrote:
> 
> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/