Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ae3ba4fd966e38d8d766d19f7a58b551df8ecc97 Commit: ae3ba4fd966e38d8d766d19f7a58b551df8ecc97 Parent: 4942de4a0e914f205d351a81873f4f63986bcc3c Author: Al Viro <[EMAIL PROTECTED]> AuthorDate: Wed Sep 26 08:20:44 2007 +0200 Committer: Jens Axboe <[EMAIL PROTECTED]> CommitDate: Wed Sep 26 08:20:44 2007 +0200
cdrom_open() forgets to unlock on -EROFS failure exits Signed-off-by: Al Viro <[EMAIL PROTECTED]> Signed-off-by: Jens Axboe <[EMAIL PROTECTED]> --- 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--; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html