From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Oct 2015 10:04:35 +0000 (+0200)
Subject: Revert "libblkid: support LSI RAID on partition too"
X-Git-Tag: v2.28-rc1~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4546fd398faa62d6627956af246253b073fd06f6;p=thirdparty%2Futil-linux.git

Revert "libblkid: support LSI RAID on partition too"

This reverts commit bc9007c372765ad4a1c7e1d3d69ba8be800f250f.

We need a better way, it seems that the original report is mostly
about udev rules disadvantages than about libblkid bug. See RH
bugzilla (#1172510) for more details.
---

diff --git a/libblkid/src/superblocks/lsi_raid.c b/libblkid/src/superblocks/lsi_raid.c
index f421ac9dbe..697b0fe89b 100644
--- a/libblkid/src/superblocks/lsi_raid.c
+++ b/libblkid/src/superblocks/lsi_raid.c
@@ -31,6 +31,8 @@ static int probe_lsiraid(blkid_probe pr,
 
 	if (pr->size < 0x10000)
 		return 1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return 1;
 
 	off = ((pr->size / 0x200) - 1) * 0x200;
 	lsi = (struct lsi_metadata *)