git: 719747125bbb - main - ffsinfo: Remove support for vinum volumes

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Thu, 23 Jan 2025 16:21:07 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=719747125bbbc91039ead3177a4360f502c8b1e0

commit 719747125bbbc91039ead3177a4360f502c8b1e0
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-01-23 15:33:21 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-01-23 16:20:43 +0000

    ffsinfo: Remove support for vinum volumes
    
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D48538
---
 sbin/ffsinfo/ffsinfo.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index f2b25e582bda..842d5c20bad0 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -186,27 +186,18 @@ main(int argc, char **argv)
 		 * No path prefix was given, so try in this order:
 		 *     /dev/r%s
 		 *     /dev/%s
-		 *     /dev/vinum/r%s
-		 *     /dev/vinum/%s.
 		 * 
-		 * FreeBSD now doesn't distinguish between raw and  block
+		 * FreeBSD now doesn't distinguish between raw and block
 		 * devices any longer, but it should still work this way.
 		 */
-		len = strlen(device) + strlen(_PATH_DEV) + 2 + strlen("vinum/");
+		len = strlen(device) + strlen(_PATH_DEV) + 2;
 		special = (char *)malloc(len);
 		if (special == NULL)
 			errx(1, "malloc failed");
 		snprintf(special, len, "%sr%s", _PATH_DEV, device);
 		if (stat(special, &st) == -1) {
+			/* For now this is the 'last resort' */
 			snprintf(special, len, "%s%s", _PATH_DEV, device);
-			if (stat(special, &st) == -1) {
-				snprintf(special, len, "%svinum/r%s",
-				    _PATH_DEV, device);
-				if (stat(special, &st) == -1)
-					/* For now this is the 'last resort' */
-					snprintf(special, len, "%svinum/%s",
-					    _PATH_DEV, device);
-			}
 		}
 		device = special;
 	}