From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Sep 2013 10:54:19 +0000 (+0200)
Subject: libblkid: diffs between errors and failed probing in via raid
X-Git-Tag: v2.24-rc1~286
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42d3e8163193baa3c9005ede794d60a4cb039cf5;p=thirdparty%2Futil-linux.git

libblkid: diffs between errors and failed probing in via raid

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

diff --git a/libblkid/src/superblocks/via_raid.c b/libblkid/src/superblocks/via_raid.c
index eba7e4bf2f..5f91cc4053 100644
--- a/libblkid/src/superblocks/via_raid.c
+++ b/libblkid/src/superblocks/via_raid.c
@@ -52,9 +52,9 @@ static int probe_viaraid(blkid_probe pr,
 	struct via_metadata *v;
 
 	if (pr->size < 0x10000)
-		return -1;
+		return 1;
 	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
-		return -1;
+		return 1;
 
 	off = ((pr->size / 0x200)-1) * 0x200;
 
@@ -64,12 +64,14 @@ static int probe_viaraid(blkid_probe pr,
 				sizeof(struct via_metadata));
 	if (!v)
 		return -1;
+
 	if (le16_to_cpu(v->signature) != VIA_SIGNATURE)
-		return -1;
+		return 1;
 	if (v->version_number > 2)
-		return -1;
+		return 1;
 	if (!via_checksum(v))
-		return -1;
+		return 1;
+
 	if (blkid_probe_sprintf_version(pr, "%u", v->version_number) != 0)
 		return -1;
 	if (blkid_probe_set_magic(pr, off,