From: Karel Zak <kzak@redhat.com>
Date: Tue, 4 Dec 2012 12:02:57 +0000 (+0100)
Subject: libblkid: re-read PART{UUID,LABEL} for successfully verified cached devices
X-Git-Tag: v2.23-rc1~458
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4388dea5f8685149ca370279760b83cc98ccb7e;p=thirdparty%2Futil-linux.git

libblkid: re-read PART{UUID,LABEL} for successfully verified cached devices

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/verify.c b/libblkid/src/verify.c
index da78d6b083..8a6fc20afd 100644
--- a/libblkid/src/verify.c
+++ b/libblkid/src/verify.c
@@ -161,9 +161,6 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
 		BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
 		BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE);
 
-	blkid_probe_enable_partitions(cache->probe, TRUE);
-	blkid_probe_set_partitions_flags(cache->probe, BLKID_PARTS_ENTRY_DETAILS);
-
 	/*
 	 * If we already know the type, then try that first.
 	 */
@@ -177,8 +174,18 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
 		blkid_probe_filter_superblocks_type(cache->probe,
 				BLKID_FLTR_ONLYIN, fltr);
 
-		if (!blkid_do_probe(cache->probe))
-			goto found_type;
+		if (blkid_do_probe(cache->probe) == 0) {
+			/*
+			 * Cool, we found FS type, let's also read PART{UUID,LABEL}
+			 */
+			blkid_probe_enable_superblocks(cache->probe, FALSE);
+			blkid_probe_enable_partitions(cache->probe, TRUE);
+			blkid_probe_set_partitions_flags(cache->probe, BLKID_PARTS_ENTRY_DETAILS);
+			if (blkid_do_probe(cache->probe) == 0)
+				goto found_type;
+		}
+
+		blkid_probe_enable_superblocks(cache->probe, TRUE);
 		blkid_probe_invert_superblocks_filter(cache->probe);
 
 		/*
@@ -193,6 +200,9 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
 		blkid_tag_iterate_end(iter);
 	}
 
+	blkid_probe_enable_partitions(cache->probe, TRUE);
+	blkid_probe_set_partitions_flags(cache->probe, BLKID_PARTS_ENTRY_DETAILS);
+
 	/*
 	 * Probe for all types.
 	 */