summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2015-10-15 12:04:35 +0200
committerKarel Zak2015-10-15 12:04:35 +0200
commit4546fd398faa62d6627956af246253b073fd06f6 (patch)
treeae43a8b3a92cc309c760d47d6df51a603c2faab2
parentmount, umount, swapon, fsck, lsblk, findmnt: ignore malformed lines (diff)
downloadkernel-qcow2-util-linux-4546fd398faa62d6627956af246253b073fd06f6.tar.gz
kernel-qcow2-util-linux-4546fd398faa62d6627956af246253b073fd06f6.tar.xz
kernel-qcow2-util-linux-4546fd398faa62d6627956af246253b073fd06f6.zip
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.
-rw-r--r--libblkid/src/superblocks/lsi_raid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libblkid/src/superblocks/lsi_raid.c b/libblkid/src/superblocks/lsi_raid.c
index f421ac9db..697b0fe89 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 *)