X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fvolume_id.c;h=7c68fb1ef9fdb42cb77c2e3164982949a4ad2a36;hb=8b5238670d2e741bc71ae3e79b499682965dc2fd;hp=9edbb69fb9418ba0a302ea453147c6a9df87c0e1;hpb=73ff769c90307e9ef2947c7ba013626fb65c1478;p=elogind.git

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index 9edbb69fb..7c68fb1ef 100644
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -86,7 +86,7 @@ static void default_log(int priority, const char *file, int line, const char *fo
 volume_id_log_fn_t volume_id_log_fn = default_log;
 
 /**
- * volume_id_get_label:
+ * volume_id_get_prober_by_type:
  * @type: Type string.
  *
  * Lookup the probing function for a specific type.
@@ -331,9 +331,9 @@ err:
 }
 
 /* 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;
 }
@@ -355,7 +355,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
 	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",
@@ -389,7 +389,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
 	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",
@@ -421,7 +421,7 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 	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 */