From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 16 Dec 2007 18:56:04 +0000 (+0100)
Subject: volume_id: run only once into a timeout for unreadable devices
X-Git-Tag: 174~1774
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2bb4dd9766479348a2829ceb8ef583a788bfd840;ds=sidebyside

volume_id: run only once into a timeout for unreadable devices
---

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index 59303d5bf..b82de2344 100644
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -347,6 +347,10 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
 	if (id == NULL)
 		return -EINVAL;
 
+	/* run only once into a timeout for unreadable devices */
+	if (volume_id_get_buffer(id, 0x00, 0x200) == NULL)
+		return -1;
+
 	info("probing at offset 0x%llx, size 0x%llx",
 	    (unsigned long long) off, (unsigned long long) size);
 
@@ -378,6 +382,10 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
 	if (id == NULL)
 		return -EINVAL;
 
+	/* run only once into a timeout for unreadable devices */
+	if (volume_id_get_buffer(id, 0x00, 0x200) == NULL)
+		return -1;
+
 	info("probing at offset 0x%llx, size 0x%llx",
 	    (unsigned long long) off, (unsigned long long) size);