From: Karel Zak <kzak@redhat.com>
Date: Wed, 30 Jun 2021 09:35:45 +0000 (+0200)
Subject: libblkid: remove EVMS support
X-Git-Tag: v2.38-rc1~384
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c409b7b5457ac7341a4046c63b61d0bbce6b81c;p=thirdparty%2Futil-linux.git

libblkid: remove EVMS support

"When you discover you're riding a dead horse, the best strategy is to dismount."

EVMS is dead since 2006, LVM is the winner.

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

diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index c541d30ba6..5b445b0114 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -366,35 +366,6 @@ exit:
 }
 #endif
 
-#define PROC_EVMS_VOLUMES "/proc/evms/volumes"
-
-static int
-evms_probe_all(blkid_cache cache, int only_if_new)
-{
-	char line[100];
-	int ma, mi, sz, num = 0;
-	FILE *procpt;
-	char device[110];
-
-	procpt = fopen(PROC_EVMS_VOLUMES, "r" UL_CLOEXECSTR);
-	if (!procpt)
-		return 0;
-	while (fgets(line, sizeof(line), procpt)) {
-		if (sscanf (line, " %d %d %d %*s %*s %[^\n ]",
-			    &ma, &mi, &sz, device) != 4)
-			continue;
-
-		DBG(DEVNAME, ul_debug("Probe EVMS partition %s (%d, %d)",
-					  device, ma, mi));
-
-		probe_one(cache, device, makedev(ma, mi), BLKID_PRI_EVMS,
-			  only_if_new, 0);
-		num++;
-	}
-	fclose(procpt);
-	return num;
-}
-
 static void
 ubi_probe_all(blkid_cache cache, int only_if_new)
 {
@@ -570,8 +541,6 @@ static int probe_all(blkid_cache cache, int only_if_new)
 		return 0;
 
 	blkid_read_cache(cache);
-
-	evms_probe_all(cache, only_if_new);
 #ifdef VG_DIR
 	lvm_probe_all(cache, only_if_new);
 #endif