From nobody Thu Jan 23 16:21:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yf5m35Sh6z5l8RM; Thu, 23 Jan 2025 16:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yf5m33Wphz3slZ; Thu, 23 Jan 2025 16:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737649267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7Gj+hEhjPN/j+YhZWOHWfa8Oj7vWQV/RfRt+zBpqJs=; b=uUNqowIMGNIio84IlsPVPH/i4l10ZSXxYiOeHgp/v/pWfFZxYOqgNb9QnHjF1DqVOmNeZE X9zj9nXzu8Pt3Q8u8ZUjC8oATuJcrbHrnh9kIwtIRjOTcIFAuNFu45DC/2OTh6vLmhLH8O kdgRjJaQZX27QddX7Tj+5ZCTmtOCZGPuRAAZ7uqhFvIcIti/ypTJsSoKVyB2E1aXA5acbK Li8bPt9V1HTeja3q2z5GKDWd69gaXkHar/4X4cidV+1FZhUXKMI94jwaADKyrWPntx9sLV BX4wtbNIdI7OnBWUz/X6PoN1bsaOeUKlm3r6s0/dUuaOkSER3oi5+QwvG24JnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737649267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7Gj+hEhjPN/j+YhZWOHWfa8Oj7vWQV/RfRt+zBpqJs=; b=cWHbnXSK8VbbhRR2AQu/xv/B2NEotV7NUODI8h3nsI01Esr7fm3Ml9k34VUATB8Z8RusOX qxVKu5hdYbvkt0IcsSD7Hyzl1f2oY4lbVaU3iy2WuzPTLoVu0J6OzvA3vzPAJ0Mm8UXD1y sEXR58CjqJYE4H0CD42FkoLJUeNbgxZX/5fF0bkPYt9NLQrAe22Lwyeq+FbN28SPPaeaED uR0qAcY2eV14OhjGjEltx3yy5efF2b/pEwYVe51JLc6XTeYOjP6+mS8Th4vGfuj+L5lxLp w7C+mIsKtAWEXKCUCntcDgSJLo5EGce2zmqyUyf3uOIxilfTVBODfeq8dQZb1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737649267; a=rsa-sha256; cv=none; b=YyzqGTCfe9wFnqjGhYlU/Cx/mZQ7OVxEqOMkdPDrxSDZ2FZ5pCdQmweTV8/iu2EDCwiYq2 SQq1JmWhPqC8Iljr4UktQaATaXwE2hkPMLPDFxNzH6+snwDo6FVRXouy8G89uBP28th35F 1uElSlhDJnwmQ5U85ZRcwVOrvZelag6m3QS9F5Hhb7rzzDFE/1SsnA5+y8D1731JpyFkzk tKVRNsquAAy+Gc23UAN6S5v53vVq8l/WYyQfuZE0YdyYerWHJYd3GWp2b6oJWV9eoqAlmG 2wmI6KUMeRKn5tspMn2Eeyv5djlcDLhwHaoMls6igRK/Z04ktGq4giEBbDtHHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yf5m32rpVzm0H; Thu, 23 Jan 2025 16:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NGL76t001136; Thu, 23 Jan 2025 16:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NGL7we001133; Thu, 23 Jan 2025 16:21:07 GMT (envelope-from git) Date: Thu, 23 Jan 2025 16:21:07 GMT Message-Id: <202501231621.50NGL7we001133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 719747125bbb - main - ffsinfo: Remove support for vinum volumes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 719747125bbbc91039ead3177a4360f502c8b1e0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=719747125bbbc91039ead3177a4360f502c8b1e0 commit 719747125bbbc91039ead3177a4360f502c8b1e0 Author: John Baldwin AuthorDate: 2025-01-23 15:33:21 +0000 Commit: John Baldwin 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; }