From: Jan Drzewiecki <jonie@icpnet.pl>
Date: Tue, 26 Oct 2010 16:10:57 +0000 (-0400)
Subject: cdrom_id: Fix media state for unreadable DVDs
X-Git-Tag: 174~311
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d43e5e5b5a2e27fb75a6e19cca457ca40ad160e4

cdrom_id: Fix media state for unreadable DVDs

If the disc is unreadable and reading of the first 32 blocks fails set the
cd_media status to 0 (not present). This will prevent udev from executing blkid
next that tries to determine fs on the disc and which in this case may seem to
hang forever locking the drive.

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index ec001cde7..f0e1cbbc4 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -696,6 +696,7 @@ static int cd_media_info(struct udev *udev, int fd)
 		scsi_cmd_set(udev, &sc, 9, 0);
 		err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
 		if ((err != 0)) {
+			cd_media = 0;
 			info_scsi_cmd_err(udev, "READ FIRST 32 BLOCKS", err);
 			return -1;
 		}