From nobody Thu Apr 16 01:33:57 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 4fx0sd2kW2z6ZrLR for ; Thu, 16 Apr 2026 01:33:57 +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 4fx0sd26N4z3CKZ for ; Thu, 16 Apr 2026 01:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303237; 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=UUbK/JH6OLTAD5U0wqZTKCkEyo2MeIDvnOCNuSOY4m4=; b=pRGquRXX08aA+0C8IjQIxMRUpuYP8hQPFJaB72HhQ+SbTJkVKXX74fl/aHhHq66q+wXD2k QvgABxVgf2W8eMAImtqx+O1F6xaZE4pUOk9pNlkobwd4HIdTpP+6JIpdU3FOv86yvlk3Cj KUJ4tOBJVu92SmClwQJ1yIm1/yaPHMfY2HGMV1l0b8CTdlVwUQAYldCxzJAZsjsGlbCFJ0 XbbKxUy/s6YESrqfqDQrQgR8N/uM8eRJUQ3/eS01hTqKDm1S9KQTqkrHJjrlxhOy3G66gS 5p5NQ0JnvA+iNfhDVcpWnZ0Bh5ejw29v03GzH2mPgaefzety0/LayGjn8/tiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776303237; a=rsa-sha256; cv=none; b=vRPzW8ttULR2++UIh/HZHredsgi0Rq/hyWFy5d9U0jm4PuM0aWNZgISG6YlGYRsWnXITGK 8XnzPyZQ4X5fBzywGVFdRbW2QO/3BFEcByVbRuACbdRgADofIf/LxyUbYpkWfdYq28KMhH xoII68RnIeneXRh77knAG864sU9ylIPr5PN73NlNJhNvEYT4AWez65Z3RnlpfJK+HNv04Y Es5pjJDPRtFZm+eCEusOuQG+Z5HCeup66UIKwoFMytcfUc2GhZnJmQPqogwjduruTIGSRS W8r0WnJ5dZysHXFu9heMy/E8U9uPs+8508oZKfdPetMtapli03i6Dvd5Ba5vnA== 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=1776303237; 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=UUbK/JH6OLTAD5U0wqZTKCkEyo2MeIDvnOCNuSOY4m4=; b=U+Je+F59dUhs0nPlOW5gwfO4l5qeCxqax4EgvgrcxPz41JoniMePe2+pBaojKfwkyy0kp8 RCG9Ujg2x/gy56MxBTYhc+f542ZnZSqPynogaVAeP6cTWswW3DHpNIaoBJWDDllbLp5p5k i8swEgq3iKYBQMK2nwfTqsfxyC3aKO2MewKgxUqloZfz3mtCRGCaI+DFXw6qrY1gX6+gKZ vWuOeZUjrRnRk6CYythMC6cFZFO4Kz9KE9zKsce2n6liYnZkUzE9kbHK4niHH0ycPL1Oyw pG8ZoLS5A2IF/MDdIphloV/qpgd252PHHzJOXJXzo/IQDpvaC26N8wZ9jId6jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx0sd1P96zmKT for ; Thu, 16 Apr 2026 01:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 01:33:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 240c22909a06 - stable/15 - 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 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/15 X-Git-Reftype: branch X-Git-Commit: 240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 01:33:57 +0000 Message-Id: <69e03c85.479dc.6b9e02b4@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 commit 240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 Author: Alexander Ziaee AuthorDate: 2026-04-13 01:59:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-16 01:33:35 +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;