d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

df: do not report a 100% full inode usage on fs without inodes

Browse Source 
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
This commit is contained in:
Baptiste Daroussin 2022-03-10 15:28:50 +01:00
parent f03aca96b8
commit 2eee44bd5e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/df/df.1
View File

@ -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

9
bin/df/df.c
View File

@ -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)