From owner-svn-src-all@freebsd.org Wed Sep 4 20:14:22 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 42E2DCCA9E; Wed, 4 Sep 2019 20:14:22 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Nw5V0Zj3z3LwS; Wed, 4 Sep 2019 20:14:22 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC97720E31; Wed, 4 Sep 2019 20:14:21 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x84KEL7G054254; Wed, 4 Sep 2019 20:14:21 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x84KELnS054253; Wed, 4 Sep 2019 20:14:21 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201909042014.x84KELnS054253@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 4 Sep 2019 20:14:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r351829 - stable/12/usr.bin/nfsstat X-SVN-Group: stable-12 X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: stable/12/usr.bin/nfsstat X-SVN-Commit-Revision: 351829 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Sep 2019 20:14:22 -0000 Author: rmacklem Date: Wed Sep 4 20:14:21 2019 New Revision: 351829 URL: https://svnweb.freebsd.org/changeset/base/351829 Log: MFC: r350395 Fix printing of Server Re-Failed and Server Faults. nfsstat -s prints bogus large numbers for the Server Re-Failed and Server Faults fields. This was introduced by r328588. Although I know nothing about libxo, these lines aren't titles and this patch seems to fix the problem, so I am committing it for rea@ who emailed it to me. It also deleted the trailing ':' from the title lines, since those were not in the pre-r328588 output. If there is a more correct fix, someone conversant with libxo will need to do so. Modified: stable/12/usr.bin/nfsstat/nfsstat.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/nfsstat/nfsstat.c ============================================================================== --- stable/12/usr.bin/nfsstat/nfsstat.c Wed Sep 4 20:08:36 2019 (r351828) +++ stable/12/usr.bin/nfsstat/nfsstat.c Wed Sep 4 20:14:21 2019 (r351829) @@ -460,11 +460,11 @@ intpr(int clientOnly, int serverOnly) xo_close_container("operations"); xo_open_container("server"); - xo_emit("{T:Server Re-Failed:}\n"); - xo_emit("{T:retfailed/%17ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs); + xo_emit("{T:Server Re-Failed}\n"); + xo_emit("{:retfailed/%16ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs); - xo_emit("{T:Server Faults:}\n"); - xo_emit("{T:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs); + xo_emit("{T:Server Faults}\n"); + xo_emit("{:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs); xo_emit("{T:Server Write Gathering:/%13.13s}\n");