From nobody Fri May 29 15:20:35 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 4gRn9c6xJxz6fh9H for ; Fri, 29 May 2026 15:20:36 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRn9c26Scz4440 for ; Fri, 29 May 2026 15:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780068036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g9EwJ3gTQ9PLnfprncJe5bF2WFpuS2qL/g8YRdd59hI=; b=sSfzGS84F0sD1B9hEWW6FzREGLExcLVBlu6xJIlw2JIqcK2pY933ZB69geSyxku0wLqdEa 878dunbbhO6g/qQdXXm9aC1i3URzry/ANI6FJ/gqZbZaOC5CfM3HW5cgohvWlUHa6JHwo/ 11Bi1fBO6+9xSk3JsEYF7FtHf0c5op0jA5d0wu8TosptCo47Kz6Ojfi9z/lLTByOVD5fJk hRNTa7vZ/VS7J0Zgr4J3op/jyQeaRWDsYOg0anWuszaGN487/L7JpVLXg30RgA1sOtO57Z AmHyluWNIiQhkaQsYaU4sFJBXgBvJJmRqR4KMHTZ2srpfkZZMWdpvFnbZOYRRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780068036; a=rsa-sha256; cv=none; b=OKJ8pT7GFkVf9Y/uKvXM9nJZ9zqDHE+9AXT8cXkbdkjBIlVIn6r85IaAA2U4t0ZFnN8dJv rA8fUNc9Iemm1SrTKMWcbRq2NXqs1oLv+aNq5F8fx8DMeSeNWK9ULmWg9R2YrhyQfkwNwH sDFXTJNinVHsYdpeMXlQrRvy9tkwE4RoZIqylIGoqPKHQl1Z5TDTjMxnseluD/iHmCOFeD aR6tRh5bw9jxD8wC+e7psp936Utz2iwR1FoOHl8iaqxnfd8OWbGRA14zHS1i9Dy5KydhZD 045lrEbjhcPhN05aKJX4HOojDXXx/JClg+q1vcwrum+vgh82zOAoGKyRw5/Ymw== 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=1780068036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g9EwJ3gTQ9PLnfprncJe5bF2WFpuS2qL/g8YRdd59hI=; b=ybILCFWhWMfliOXrDOEXo0C2mRufafZf4z0sOKVKTjPk5GUE7vjr875SbhKX9jypcetWfL chlGXXOGqidtS2TAZQESvfARSK8d/vxVnbXBzV4U0jB5AgOPFjT/UT7J+M1aVUpKFrp+pA iZHlP/KcM9Bp7a3vw3sYkq3uQivEAXIvFsRFuOkMkPftT41C2zPmxryGQ7mtQz34pgyNqY st9sZsytjlVw1QQMXWgz9tOBzyFMKNkzJoyuRoSud7eJrI2W52ejyjuAQHA4sAZD3ek6SL lwDriJWygTEoRLUjbBJ0sARd1ZOKWJmkbguDVkhjPDuI3yuK2kae+yH8mCiCgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRn9c0CV9zf4Z for ; Fri, 29 May 2026 15:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30073 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 15:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Shunchao Hu From: ShengYi Hung Subject: git: 117bd8510e44 - stable/15 - compat/linprocfs: Update /proc/partitions output 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 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 117bd8510e44b3b85e790159ad9a184d5cdbaa62 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 15:20:35 +0000 Message-Id: <6a19aec3.30073.6bb8dda3@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=117bd8510e44b3b85e790159ad9a184d5cdbaa62 commit 117bd8510e44b3b85e790159ad9a184d5cdbaa62 Author: Shunchao Hu AuthorDate: 2026-04-07 13:07:31 +0000 Commit: ShengYi Hung CommitDate: 2026-05-29 15:19:48 +0000 compat/linprocfs: Update /proc/partitions output Linux /proc/partitions reports the major/minor pair, the device size in 1K blocks, and the device name. linprocfs still printed obsolete statistics columns and reported the size in bytes. Update linprocfs_dopartitions() to emit the Linux-style header and report provider sizes in 1K blocks. Signed-off-by: Shunchao Hu Reviewed by: des MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/2126 Closes: https://github.com/freebsd/freebsd-src/pull/2126 (cherry picked from commit 5f5cc3c67ae8a4d9a27e750bef98a9ce1a6b2cf5) --- sys/compat/linprocfs/linprocfs.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 941b76788dc1..786a486b9143 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -659,8 +659,7 @@ linprocfs_dopartitions(PFS_FILL_ARGS) int major, minor; g_topology_lock(); - sbuf_printf(sb, "major minor #blocks name rio rmerge rsect " - "ruse wio wmerge wsect wuse running use aveq\n"); + sbuf_printf(sb, "major minor #blocks name\n\n"); LIST_FOREACH(cp, &g_classes, class) { if (strcmp(cp->name, "DISK") == 0 || @@ -672,13 +671,10 @@ linprocfs_dopartitions(PFS_FILL_ARGS) major = 0; minor = 0; } - sbuf_printf(sb, "%d %d %lld %s " - "%d %d %d %d %d " - "%d %d %d %d %d %d\n", - major, minor, - (long long)pp->mediasize, pp->name, - 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0); + sbuf_printf(sb, "%4d %7d %10lld %s\n", + major, minor, + B2K((long long)pp->mediasize), + pp->name); } } }