}
/* run only once into a timeout for unreadable devices */
-static int device_is_readable(struct volume_id *id)
+static int device_is_readable(struct volume_id *id, uint64_t off)
{
- if (volume_id_get_buffer(id, 0x00, 0x200) != NULL)
+ if (volume_id_get_buffer(id, off, 0x200) != NULL)
return 1;
return 0;
}
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx",
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx",
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
/* probe for raid first, because fs probes may be successful on raid members */
fd = open(path, O_RDONLY);
if (fd < 0) {
- dbg("unable to open '%s'", path);
+ dbg("unable to open '%s'\n", path);
return NULL;
}