From nobody Fri Mar 11 07:49:49 2022 X-Original-To: dev-commits-src-main@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 F0F5C1A17613; Fri, 11 Mar 2022 07:49:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFJ4F69PLz3nFq; Fri, 11 Mar 2022 07:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646984989; 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=CEumjDa4NF74yyNDGdLKg9u4hMzwhMjYYysFq4kWJKI=; b=hZeo1igbbTtGxLKcV0EbJoemY+1qqd5gMdxlSTGabQuOvNMt3MQ1fSppUnmKAGI0l/h46E fuUGV29ocgN98Dyh+qcarAE0Fnug0q763b6qbIVAxvPDxAvtCyjliRbsLMddeGSPj8VXqi aUA9Ry6gW4RNzMg+h1iRWunpHHV2v5BWP1QP8qQLE4lRfD8iS+Z3TKjapzcgcZ0EPBlq9y VAQeeyB9iRnn/qCRa54jm9XQc7KJ26zwu/QpDExJuDCxWYu2xCwJGbfwM84dDvB6CII8sv kCtzcUERvuU4wmnapYqNG0JU42QsrOg4b6ZW6IhfaEYb+7WmIwrYp0WK1nfhQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B395015448; Fri, 11 Mar 2022 07:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22B7nnaP072113; Fri, 11 Mar 2022 07:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22B7nnd2072112; Fri, 11 Mar 2022 07:49:49 GMT (envelope-from git) Date: Fri, 11 Mar 2022 07:49:49 GMT Message-Id: <202203110749.22B7nnd2072112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2eee44bd5ebc - main - df: do not report a 100% full inode usage on fs without inodes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eee44bd5ebcb88bf304215be1b0c68b6802a924 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646984989; 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=CEumjDa4NF74yyNDGdLKg9u4hMzwhMjYYysFq4kWJKI=; b=qAhWt6rG0CtbBg9NOm2qpATTxq9/UYtMwarWhZ95Ia5uNLKi0pLuEAwkVWMa3hpm4uvPUU Y4KL/q+z4kFgYltkgD2p3sEFTHQyJTjABcEF/WBXuaQV3P7/k59aOGSrtBtUq3AqbuqokB reLU7Pm5H1p+DyUcYDlop/SyECxUn6Z4qo+rV0a+KRr04aSw6OeEOeJWEkHVlaxYifRwrW Nr2su8yBul3IP4b60uEb1KAc5uh4fEZk/sJxblA6ZZKHx23x4O65SFZ6Gkvo2UsoN9/ZOz hMWCJ7/Ll7Cr1vFjwSEfVQjFKCm1EDO3loiMJige7yvxpY5Q81TZhXPKrHPuPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646984989; a=rsa-sha256; cv=none; b=NAFofezP9peabFDtN04SACD6o+JegJ7v27BwLgZImqARAklRWYdfakcV++Uqno+11lWT60 bV/aU6RqWbkPi/jdVFTvl4+oq0C+DfJTDOPefOIzA/X2BhUsFtVzAA72tFddZmxyMpUv7K 2hrMeRphx6dqxLshwg0kGBkUtsnBLOUBQpzFVfnp4sEfsMFmrSGGJoG0Xlwtyl9pM06J/5 GPm66HBwVWor2hQkt90Fkg8Db/1rzFLKo8WNFfZYFhbufrQqeS2qmGkpaH2OjAgXU/FOzc ZS4aMi8iLNLvAq6/QUciYSaklHKZKaS+mLTD+gf8i4CfFjibzOykb2OJ9NY3xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2eee44bd5ebcb88bf304215be1b0c68b6802a924 commit 2eee44bd5ebcb88bf304215be1b0c68b6802a924 Author: Baptiste Daroussin AuthorDate: 2022-03-10 14:28:50 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-11 07:49:44 +0000 df: do not report a 100% full inode usage on fs without inodes Before: devfs 2 2 0 100% 0 0 100% /dev After: devfs 2 2 0 100% 0 0 - /dev The previous behaviour was confusing for end users and many monitoring tools Note the linux df tools is also using the same syntax '-' for such filesystem MFC After: 2 weeks Reviewed by: manu, emaste, imp Differential Revision: https://reviews.freebsd.org/D34515 --- bin/df/df.1 | 5 ++++- bin/df/df.c | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/df/df.1 b/bin/df/df.1 index d542dbde8067..64e471fedc42 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd October 5, 2020 +.Dd March 11, 2022 .Dt DF 1 .Os .Sh NAME @@ -109,6 +109,9 @@ In conjunction with the or .Fl H options, the number of inodes is scaled by powers of 1000. +In case the filesystem has no inodes then +.Sq - +is displayed instead of the usage percentage. .It Fl k Use 1024 byte (1 Kibibyte) blocks rather than the default. This overrides the diff --git a/bin/df/df.c b/bin/df/df.c index 63c37de92d62..627d8b1c861d 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -561,9 +561,12 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) xo_emit(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } - xo_emit(" {:inodes-used-percent/%4.0f}{U:%%} ", - inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + if (inodes == 0) + xo_emit(" {:inodes-used-percent/ -}{U:} "); + else { + xo_emit(" {:inodes-used-percent/%4.0f}{U:%%} ", + (double)used / (double)inodes * 100.0); + } } else xo_emit(" "); if (strncmp(sfsp->f_mntfromname, "total", MNAMELEN) != 0)