From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 18 Jul 2003 23:10:28 +0000 (-0400)
Subject: tag.c (blkid_find_dev_with_tag): If blkid_probe_all() returns an
X-Git-Tag: E2FSPROGS-1_34~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849c6102507c93ca96efa68c0e575514e7560467;p=thirdparty%2Fe2fsprogs.git

tag.c (blkid_find_dev_with_tag): If blkid_probe_all() returns an
	error, then reflect that error upwards; don't try again
	(forever).  This prevents an infinite loop when /proc and
	the /etc/blkid.tab file are not present.
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 45b75f813..7100db055 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-18  Theodore Ts'o  <tytso@mit.edu>
+
+	* tag.c (blkid_find_dev_with_tag): If blkid_probe_all() returns an
+		error, then reflect that error upwards; don't try again
+		(forever).  This prevents an infinite loop when /proc and
+		the /etc/blkid.tab file are not present.
+
 2003-07-06  Theodore Ts'o  <tytso@mit.edu>
 
 	* blkid_types.h.in: Fix gcc -Wall nitpicks (don't use #elsif)
diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c
index 7acf3a6a3..67cd374c2 100644
--- a/lib/blkid/tag.c
+++ b/lib/blkid/tag.c
@@ -332,7 +332,8 @@ try_again:
 	}
 
 	if (!dev && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) {
-		blkid_probe_all(cache);
+		if (blkid_probe_all(cache) < 0)
+			return NULL;
 		goto try_again;
 	}
 	return dev;