From nobody Thu Aug 6 22:31:53 2026 X-Original-To: dev-commits-src-branches@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 4hGMTP6X6cz6nLvH for ; Thu, 06 Aug 2026 22:31:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGMTP4G0kz4Ps4 for ; Thu, 06 Aug 2026 22:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786055513; 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=7HtgIwpYcHmMfuYH6aBHPdL5V+FVfkZ4uQ6uM8pzhCI=; b=OWyOe+xWKS7ZiqB3EEsbrD9cUPnBdwg+JuFllXWLDRklHr4cJpUTD03rmUMsUIqYcLDq2+ O9Ao/rKpTjikcSu3brxL4D+gfX3OIM3AJqU8+oVub7PONUQ3NK2rMT9alK7bFGapbq80Fu ptZJS4Uh41lyXHvAqPXi1mJVzWdBjhn6J9Zu/aWhhjefatsl4oFzKuEb/Mq3/pHojwa+wQ Ff1y9cT6Ns3QorAdtK5lwxy97mZyd3gFBA8tXa6rXKyaSWDT3LQZvuVuCoJ/3QvzLkXail Lren0cYn5Tq1U7Hvs6xUgzaUNSLugXMZo1LzM2fEhInCyekRKUpfOTlmQpBaNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786055513; a=rsa-sha256; cv=none; b=LQtEp1bHm04cuaKL/alDkDpufZ2JOad29s7EY5InunC8OPBjamtb1CrvYIrTidb5aGvkdH Skjzcm0AWLunkQw4Ze9WApyGNRtqI2Civqefa3zU1NEMj8lgXIS9X//86Zown++0x2Rglp aC2MCg6YE5G5Zt+RgiYMdAWTK1HqGKxLUrtjdM/fbHhRG2IqxlXXF8LOVGJvdFiWlOaulB VL5GqAwyYjp888pzYvjDiLCSzuHE/iGjUVPKteUMpwxZL818GWKBFcgbP3V2TZu4S9gF5e 8DBnpZQjKTgKTLnG88xQyPYlw4j2dvj0hHuZYOt5Ztv8X0PoUDQXc8ZTpfmL/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786055513; 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=7HtgIwpYcHmMfuYH6aBHPdL5V+FVfkZ4uQ6uM8pzhCI=; b=tiJZcX7MKZ2aG+u82iDohfOqHkmJX+QhKAYUtDfR0E2QTYq+tnPVjOkdZiLDN7TwbAlhno G/7gAyrEvDUU7SYZ0ObsXqKiy42r8ukae59dzxJll+h1i1x7/N/iwF87ihRmFLL/Q8f10d c6FLYuty3xQYwTi/UvCAsZV7XLFfISAIKSWrqCuf4nw88nu0cV+8xcmB/H7gZtJUJhydNh s8UkAbEjfqCIcPZ2N1Glh3+sFofiluU0Tkbb5FlyJ0o2lVZWZyHXj0rdGcTOZUvNZSnUeH 2Bk6tNMPz7vqkH+iOq3xp6T7B+PidWSxkaCVVa3Y1b70bbcpwSUZ8z/BoJlohg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGMTP2r7szgt3 for ; Thu, 06 Aug 2026 22:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f53e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 22:31:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 4bcf7485ee12 - stable/14 - diskinfo: Align and alphabetize options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bcf7485ee125f5cf1bbaf90c3fcd44cbdc69285 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 22:31:53 +0000 Message-Id: <6a750b59.1f53e.79bbe16c@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4bcf7485ee125f5cf1bbaf90c3fcd44cbdc69285 commit 4bcf7485ee125f5cf1bbaf90c3fcd44cbdc69285 Author: Alexander Ziaee AuthorDate: 2026-04-13 01:59:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-08-06 22:26:07 +0000 diskinfo: Align and alphabetize options MFC after: 3 days (cherry picked from commit afe57c12e97d5c8773d829c2914f35462a7cdd0c) --- usr.sbin/diskinfo/diskinfo.8 | 12 ++++++------ usr.sbin/diskinfo/diskinfo.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 970bafd4f8e5..aea4c123048a 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -35,7 +35,7 @@ .Nd get information about disk device .Sh SYNOPSIS .Nm -.Op Fl citSvw +.Op Fl ciStvw .Ar disk ... .Nm .Op Fl l @@ -52,9 +52,7 @@ utility prints out information about a disk device, and optionally runs a naive performance test on the device. .Pp The following options are available: -.Bl -tag -width ".Fl v" -.It Fl v -Print fields one per line with a descriptive comment. +.Bl -tag -width "-c" .It Fl c Perform a simple measurement of the I/O read command overhead. .It Fl i @@ -70,16 +68,18 @@ character as a separator. Return the physical path of the disk. This is a string that identifies the physical path to the disk in the storage enclosure. -.It Fl s -Return the disk ident, usually the serial number. .It Fl S Perform synchronous random write test (ZFS SLOG test), measuring time required to write data blocks of different size and flush disk cache. Blocks of more then 128KB are written with multiple parallel operations. +.It Fl s +Return the disk ident, usually the serial number. .It Fl t Perform a simple and rather naive benchmark of the disks seek and transfer performance. +.It Fl v +Print fields one per line with a descriptive comment. .It Fl w Allow disruptive write tests. .El diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index f091d0ccfbea..d8a79d430edb 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,7 +58,7 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + fprintf(stderr, "usage: diskinfo [-citSvw] disk ...\n" " diskinfo [-l] -p disk ...\n" " diskinfo [-l] -s disk ...\n" ); @@ -91,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpSstvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -107,13 +107,13 @@ main(int argc, char **argv) case 'p': opt_p = 1; break; - case 's': - opt_s = 1; - break; case 'S': opt_S = 1; opt_v = 1; break; + case 's': + opt_s = 1; + break; case 't': opt_t = 1; opt_v = 1;