1 files changed, 32 insertions, 21 deletions

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index 0e4745ac..38d42762 100644
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -160,6 +160,11 @@ static void blkid_probe_reset_vals(blkid_probe pr)
 	pr->nvals = 0;
 }
 
+static void blkid_probe_reset_idx(blkid_probe pr)
+{
+	pr->idx = -1;
+}
+
 void blkid_reset_probe(blkid_probe pr)
 {
 	if (!pr)
@@ -169,14 +174,13 @@ void blkid_reset_probe(blkid_probe pr)
 		memset(pr->buf, 0, pr->buf_max);
 	pr->buf_off = 0;
 	pr->buf_len = 0;
-	pr->idx = 0;
 	if (pr->sbbuf)
 		memset(pr->sbbuf, 0, BLKID_SB_BUFSIZ);
 	pr->sbbuf_len = 0;
 	blkid_probe_reset_vals(pr);
+	blkid_probe_reset_idx(pr);
 }
 
-
 /*
  * Note that we have two offsets:
  *
@@ -263,7 +267,6 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	pr->fd = fd;
 	pr->off = off;
 	pr->size = 0;
-	pr->idx = 0;
 
 	if (size)
 		pr->size = size;
@@ -307,7 +310,7 @@ int blkid_probe_reset_filter(blkid_probe pr)
 		return -1;
 	if (pr->fltr)
 		memset(pr->fltr, 0, BLKID_FLTR_SIZE * sizeof(unsigned long));
-	pr->idx = 0;
+	blkid_probe_reset_idx(pr);
 	return 0;
 }
 
@@ -324,9 +327,10 @@ int blkid_probe_filter_types(blkid_probe pr, int flag, char *names[])
 
 	if (!pr || !names)
 		return -1;
-	if (!pr->fltr)
+	if (!pr->fltr) {
 		pr->fltr = calloc(BLKID_FLTR_SIZE, sizeof(unsigned long));
-	else
+		blkid_probe_reset_idx(pr);
+	} else
 		blkid_probe_reset_filter(pr);
 
 	if (!pr->fltr)
@@ -355,7 +359,6 @@ int blkid_probe_filter_types(blkid_probe pr, int flag, char *names[])
 		}
 	}
 	DBG(DEBUG_LOWPROBE, printf("a new probing type-filter initialized\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -375,9 +378,10 @@ int blkid_probe_filter_usage(blkid_probe pr, int flag, int usage)
 
 	if (!pr || !usage)
 		return -1;
-	if (!pr->fltr)
+	if (!pr->fltr) {
 		pr->fltr = calloc(BLKID_FLTR_SIZE, sizeof(unsigned long));
-	else
+		blkid_probe_reset_idx(pr);
+	} else
 		blkid_probe_reset_filter(pr);
 
 	if (!pr->fltr)
@@ -393,7 +397,6 @@ int blkid_probe_filter_usage(blkid_probe pr, int flag, int usage)
 			blkid_bmp_set_item(pr->fltr, i);
 	}
 	DBG(DEBUG_LOWPROBE, printf("a new probing usage-filter initialized\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -407,8 +410,8 @@ int blkid_probe_invert_filter(blkid_probe pr)
 	for (i = 0; i < BLKID_FLTR_SIZE; i++)
 		pr->fltr[i] = ~pr->fltr[i];
 
+	blkid_probe_reset_idx(pr);
 	DBG(DEBUG_LOWPROBE, printf("probing filter inverted\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -450,18 +453,16 @@ int blkid_do_probe(blkid_probe pr)
 {
 	int i = 0;
 
-	if (!pr)
+	if (!pr || pr->idx < -1)
 		return -1;
 
 	blkid_probe_reset_vals(pr);
 
-	if (pr->idx)
-		i = pr->idx + 1;
+	DBG(DEBUG_LOWPROBE,
+		printf("--> starting probing loop [idx=%d]\n",
+		pr->idx));
 
-	if (i < 0 && i >= ARRAY_SIZE(idinfos))
-		return -1;
-
-	DBG(DEBUG_LOWPROBE, printf("--> starting probing loop\n"));
+	i = pr->idx + 1;
 
 	for ( ; i < ARRAY_SIZE(idinfos); i++) {
 		const struct blkid_idinfo *id;
@@ -516,10 +517,13 @@ int blkid_do_probe(blkid_probe pr)
 			blkid_probe_set_usage(pr, id->usage);
 
 		DBG(DEBUG_LOWPROBE,
-			printf("<-- leaving probing loop (type=%s)\n", id->name));
+			printf("<-- leaving probing loop (type=%s) [idx=%d]\n",
+			id->name, pr->idx));
 		return 0;
 	}
-	DBG(DEBUG_LOWPROBE, printf("<-- leaving probing loop (failed)\n"));
+	DBG(DEBUG_LOWPROBE,
+		printf("<-- leaving probing loop (failed) [idx=%d]\n",
+		pr->idx));
 	return 1;
 }
 
@@ -527,6 +531,10 @@ int blkid_do_probe(blkid_probe pr)
  * This is the same function as blkid_do_probe(), but returns only one result
  * (cannot be used in while()) and checks for ambivalen results (more
  * filesystems on the device) -- in such case returns -2.
+ *
+ * The function does not check for filesystems when a RAID signature is
+ * detected.  The function also does not check for collision between RAIDs. The
+ * first detected RAID is returned.
  */
 int blkid_do_safeprobe(blkid_probe pr)
 {
@@ -542,9 +550,12 @@ int blkid_do_safeprobe(blkid_probe pr)
 			first.nvals = pr->nvals;
 			first.idx = pr->idx;
 		}
+		count++;
+
+		if (idinfos[pr->idx]->usage & BLKID_USAGE_RAID)
+			break;
 		if (!(idinfos[pr->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;
-		count++;
 	}
 	if (rc < 0)
 		return rc;		/* error */