From nobody Mon Apr 13 19:53:29 2026 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 4fvdPj4nZ6z6Zd48 for ; Mon, 13 Apr 2026 19:53:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdPj3cjLz3mDd for ; Mon, 13 Apr 2026 19:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110009; 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=Ecoo20W0BDiowV7GMLUrP1szDo27FS3H8YANGgq9oI4=; b=o8ZuUyyy4/WNBzYwLgHdKHzmlPfLmau9C320JdpRGV5Aix/eMkL5vxT+EU0wFF1g1mwL2t NKLyiJm5LoHIb1KNEctRG6ojC3UV1qlpjQPb+/Sb74v8AbAZi5x40MW3ha5z+oqCNL0nyc JL31TaFwfO3Q02QClA6e9FjDwNqx70njmsdo9w9rcE/YKSRdcEIswgsX/gfgd4E3DVov9m zyVPucsVpX2nLbTdX9+sbukPy+4YQPwfINj4+XKiohfpqv92vSpBmtRbwBNQF0PY797l9S sFBrXstWwXDRjNhFjOpFxWdkuXLENp1TIELgaHva3q37038Y0lTYASclSsZrvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110009; a=rsa-sha256; cv=none; b=KtNAi556KJHjCiMaQgFM2HhbIEjCcSOy22a3SWiOMqcYkLuGT35XHuxG0ibA+TH4p9GX+k f4x6kA3CFW3raFyFxBGAjcdxuboQrnA+goNl0x5YEfyGFofLkeCL1k+8XQBuWjLWJnbyAA 7JKDvaPd5KbGhSFtGHc1IuiUMI+0+SpyHPnlrNKl4fhJTf2hZbNW96Jr/+8iJYG6jqM+z1 5/Wan8D1NiUNkAu/6sYmomRq6ivTMYAUCTbJRebOZk30VmnGhchCmPybWd4j17MBaAKRzl Pugi8oj71PeTfUkvaOuVUtTxCVWJGrvDURCechq51Bf4OcHJnUEznlZE7yOmbA== 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=1776110009; 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=Ecoo20W0BDiowV7GMLUrP1szDo27FS3H8YANGgq9oI4=; b=GctrxKGvNHZzPuJUbuF2VJrRQ75r7UbVMJ0xNEhW6huWatj+A+wEdpR7Jbof7tckn0WQGO 4r3EYg9DNL2d30Z2oRtUxscUKXfMfn2FoQFa9jVC11bQF4EtNAkwVjgSqbOFBFYp7I+FVl uRGcQmHUARCHZs4Ll6m+wslTbWKKkjWKA6vKyD3cmn889OOMrLy6hqcF8qnp4sep7+iXep G4BX/MS2GJhLiOAw6tZJYBeQvAxsdmnQr21lXiq2sKjs6pxRW/w7q2JmT1uax6X6VzoZBA iPD9qyQUqFgkDgeNiHLwaHhXMUASa22mivIAGUaUs/KbqWLY8NLHJcLVrizjoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdPj37Dcz2vY for ; Mon, 13 Apr 2026 19:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40a5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:53:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: afe57c12e97d - main - diskinfo: Align and alphabetize options 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afe57c12e97d5c8773d829c2914f35462a7cdd0c Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:53:29 +0000 Message-Id: <69dd49b9.40a5c.7872d0e3@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=afe57c12e97d5c8773d829c2914f35462a7cdd0c commit afe57c12e97d5c8773d829c2914f35462a7cdd0c Author: Alexander Ziaee AuthorDate: 2026-04-13 01:59:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:52:24 +0000 diskinfo: Align and alphabetize options MFC after: 3 days --- 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;