From 2bb4dd9766479348a2829ceb8ef583a788bfd840 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 16 Dec 2007 19:56:04 +0100 Subject: volume_id: run only once into a timeout for unreadable devices --- extras/volume_id/lib/volume_id.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'extras/volume_id/lib/volume_id.c') diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index 59303d5bff..b82de2344d 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); -- cgit v1.2.3-54-g00ecf