* [PATCH] btrfs-progs: filesystem usage: add avail info from statfs()
@ 2020-11-09 14:59 Sidong Yang
2020-11-09 23:16 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Sidong Yang @ 2020-11-09 14:59 UTC (permalink / raw)
To: dsterba, linux-btrfs; +Cc: Sidong Yang
Add available space information from statfs(). This can be different from
'Free (estimated)' in some cases. This patch provide more information about
filesystem usage.
Issue: #306
Signed-off-by: Sidong Yang <realwakka@gmail.com>
---
cmds/filesystem-usage.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
index ab60d769..c17e26c3 100644
--- a/cmds/filesystem-usage.c
+++ b/cmds/filesystem-usage.c
@@ -19,6 +19,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#include <sys/vfs.h>
#include <errno.h>
#include <stdarg.h>
#include <getopt.h>
@@ -430,6 +431,7 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
u64 free_min = 0;
double max_data_ratio = 1.0;
int mixed = 0;
+ struct statfs statfs_buf;
sargs = load_space_info(fd, path);
if (!sargs) {
@@ -556,6 +558,13 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
if (unit_mode != UNITS_HUMAN)
width = 18;
+ ret = statfs(path, &statfs_buf);
+ if (ret) {
+ error("cannot get space info with statfs() on '%s': %m", path);
+ ret = 1;
+ goto exit;
+ }
+
printf("Overall:\n");
printf(" Device size:\t\t%*s\n", width,
@@ -572,6 +581,8 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
width,
pretty_size_mode(free_estimated, unit_mode));
printf("min: %s)\n", pretty_size_mode(free_min, unit_mode));
+ printf(" Avail:\t\t\t%*s\n", width,
+ pretty_size_mode(statfs_buf.f_bavail * statfs_buf.f_bsize, unit_mode));
printf(" Data ratio:\t\t\t%*.2f\n",
width, data_ratio);
printf(" Metadata ratio:\t\t%*.2f\n",
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] btrfs-progs: filesystem usage: add avail info from statfs()
2020-11-09 14:59 [PATCH] btrfs-progs: filesystem usage: add avail info from statfs() Sidong Yang
@ 2020-11-09 23:16 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2020-11-09 23:16 UTC (permalink / raw)
To: Sidong Yang; +Cc: dsterba, linux-btrfs
On Mon, Nov 09, 2020 at 02:59:23PM +0000, Sidong Yang wrote:
> Add available space information from statfs(). This can be different from
> 'Free (estimated)' in some cases. This patch provide more information about
> filesystem usage.
>
> Issue: #306
> Signed-off-by: Sidong Yang <realwakka@gmail.com>
> ---
> cmds/filesystem-usage.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
> index ab60d769..c17e26c3 100644
> --- a/cmds/filesystem-usage.c
> +++ b/cmds/filesystem-usage.c
> @@ -19,6 +19,7 @@
> #include <string.h>
> #include <unistd.h>
> #include <sys/ioctl.h>
> +#include <sys/vfs.h>
> #include <errno.h>
> #include <stdarg.h>
> #include <getopt.h>
> @@ -430,6 +431,7 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
> u64 free_min = 0;
> double max_data_ratio = 1.0;
> int mixed = 0;
> + struct statfs statfs_buf;
>
> sargs = load_space_info(fd, path);
> if (!sargs) {
> @@ -556,6 +558,13 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
> if (unit_mode != UNITS_HUMAN)
> width = 18;
>
> + ret = statfs(path, &statfs_buf);
> + if (ret) {
> + error("cannot get space info with statfs() on '%s': %m", path);
I wonder when statfs would not work and I don't think it should be a
hard error, maybe a warning or some stub that says the information was
not available.
> + ret = 1;
> + goto exit;
> + }
> +
> printf("Overall:\n");
>
> printf(" Device size:\t\t%*s\n", width,
> @@ -572,6 +581,8 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
> width,
> pretty_size_mode(free_estimated, unit_mode));
> printf("min: %s)\n", pretty_size_mode(free_min, unit_mode));
> + printf(" Avail:\t\t\t%*s\n", width,
> + pretty_size_mode(statfs_buf.f_bavail * statfs_buf.f_bsize, unit_mode));
It's good to paste sample output of the command to the changelog to have
a second thought on how it actually looks. A simple 'Avail' is without
context and I as a user have no idea what it means or how to interpret
the value. Please try again.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-09 23:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-09 14:59 [PATCH] btrfs-progs: filesystem usage: add avail info from statfs() Sidong Yang
2020-11-09 23:16 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).