emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

df: use f_frsize instead of f_bsize for correct sizes

Browse Source 
Use the correct field f_frsize instead of f_bsize.

The statfs f_bsize is the "Optimal transfer block size" while the
f_frsize is the "Fragment size (since Linux 2.6)". On some FUSE
filesystems those may differ.

Fixes bug 9046

URL: https://bugs.busybox.net/show_bug.cgi?id=9046

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Natanael Copa 2016-06-23 10:42:40 +02:00 committed by Denys Vlasenko
parent 59f8197624
commit 8f4faa1e3d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coreutils/df.c
View File

@ -188,7 +188,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
if (opt & OPT_INODE) { if (opt & OPT_INODE) {
s.f_blocks = s.f_files; s.f_blocks = s.f_files;
s.f_bavail = s.f_bfree = s.f_ffree; s.f_bavail = s.f_bfree = s.f_ffree;
s.f_bsize = 1; s.f_frsize = 1;
if (df_disp_hr) if (df_disp_hr)
df_disp_hr = 1; df_disp_hr = 1;
@ -246,26 +246,26 @@ int df_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_HUMAN_READABLE #if ENABLE_FEATURE_HUMAN_READABLE
printf(" %9s ", printf(" %9s ",
/* f_blocks x f_bsize / df_disp_hr, show one fractional, /* f_blocks x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */ * use suffixes if df_disp_hr == 0 */
make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr));
printf(" %9s " + 1, printf(" %9s " + 1,
/* EXPR x f_bsize / df_disp_hr, show one fractional, /* EXPR x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */ * use suffixes if df_disp_hr == 0 */
make_human_readable_str((s.f_blocks - s.f_bfree), make_human_readable_str((s.f_blocks - s.f_bfree),
s.f_bsize, df_disp_hr)); s.f_frsize, df_disp_hr));
printf("%9s %3u%% %s\n", printf("%9s %3u%% %s\n",
/* f_bavail x f_bsize / df_disp_hr, show one fractional, /* f_bavail x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */ * use suffixes if df_disp_hr == 0 */
make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#else #else
printf(" %9lu %9lu %9lu %3u%% %s\n", printf(" %9lu %9lu %9lu %3u%% %s\n",
kscale(s.f_blocks, s.f_bsize), kscale(s.f_blocks, s.f_frsize),
kscale(s.f_blocks - s.f_bfree, s.f_bsize), kscale(s.f_blocks - s.f_bfree, s.f_frsize),
kscale(s.f_bavail, s.f_bsize), kscale(s.f_bavail, s.f_frsize),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#endif #endif
} }