File util-linux-libblkid-cdrom-errors.patch of Package util-linux-systemd.12160

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-libblkid-cdrom-errors.patch of Package util-linux-systemd.12160

From 5b7f8bbba13c6b2b26d14163569b35353ce9ceb9 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 28 Apr 2016 13:54:01 +0200
Subject: [PATCH] libblkid: make I/O errors on CDROMs non-fatal

It seems too tricky to get a real size of the data track on hybrid
disks with audio+data. It seems overkill to analyze all header in
libblkid and on some disks it's probably possible to get I/O error
almost everywhere due to crazy copy protection etc.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libblkid/src/probe.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 0c8625c57..aee0cb1ee 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -615,7 +615,10 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint
 	if (ret != (ssize_t) len) {
 		DBG(LOWPROBE, ul_debug("\tread failed: %m"));
 		free(bf);
-		if (ret >= 0)
+
+		/* I/O errors on CDROMs are non-fatal to work with hybrid
+		 * audio+data disks */
+		if (ret >= 0 || blkid_probe_is_cdrom(pr))
 			errno = 0;
 		return NULL;
 	}
-- 
2.11.0

Places

File util-linux-libblkid-cdrom-errors.patch of Package util-linux-systemd.12160

Places