Update bcachefs sources to 380885b0b8 bcachefs: Fix counting iterators for reflink...

[bcachefs-tools-debian] / cmd_fs.c

diff --git a/cmd_fs.c b/cmd_fs.c
index 3f64161f70a530a6e4469dabdadd01becd48fd24..44316fc5d3773e18f624b8744dc1f1eb0625599f 100644 (file)
--- a/cmd_fs.c
+++ b/cmd_fs.c
@@ -4,25 +4,70 @@
 
 #include <uuid/uuid.h>
 
+#include "ccan/darray/darray.h"
+
+#include "linux/sort.h"
+
 #include "libbcachefs/bcachefs_ioctl.h"
 #include "libbcachefs/opts.h"
 
 #include "cmds.h"
 #include "libbcachefs.h"
 
-static inline int printf_pad(unsigned pad, const char * fmt, ...)
+static void print_dev_usage(struct bch_ioctl_dev_usage *d, unsigned idx,
+                           const char *label, enum units units)
 {
-       va_list args;
-       int ret;
+       char *name = NULL;
+       u64 available = d->nr_buckets;
+       unsigned i;
+
+       printf("\n");
+       printf_pad(20, "%s (device %u):", label, idx);
+
+       name = !d->dev ? strdup("(offline)")
+               : dev_to_path(d->dev)
+               ?: strdup("(device not found)");
+       printf("%24s%12s\n", name, bch2_dev_state[d->state]);
+       free(name);
 
-       va_start(args, fmt);
-       ret = vprintf(fmt, args);
-       va_end(args);
+       printf("%-20s%12s%12s%12s\n",
+              "", "data", "buckets", "fragmented");
 
-       while (ret++ < pad)
-              putchar(' ');
+       for (i = BCH_DATA_SB; i < BCH_DATA_NR; i++) {
+               u64 frag = max((s64) d->buckets[i] * d->bucket_size -
+                              (s64) d->sectors[i], 0LL);
 
-       return ret;
+               printf_pad(20, "  %s:", bch2_data_types[i]);
+               printf("%12s%12llu%12s\n",
+                      pr_units(d->sectors[i], units),
+                      d->buckets[i],
+                      pr_units(frag, units));
+
+               if (i != BCH_DATA_CACHED)
+                       available -= d->buckets[i];
+       }
+
+       printf_pad(20, "  available:");
+       printf("%12s%12llu\n",
+              pr_units(available * d->bucket_size, units),
+              available);
+
+       printf_pad(20, "  capacity:");
+       printf("%12s%12llu\n",
+              pr_units(d->nr_buckets * d->bucket_size, units),
+              d->nr_buckets);
+}
+
+struct dev_by_label {
+       unsigned        idx;
+       char            *label;
+};
+
+static int dev_by_label_cmp(const void *_l, const void *_r)
+{
+       const struct dev_by_label *l = _l, *r = _r;
+
+       return strcmp(l->label, r->label);
 }
 
 static void print_fs_usage(const char *path, enum units units)
@@ -42,7 +87,7 @@ static void print_fs_usage(const char *path, enum units units)
        printf("%-20s%12s%12s%12s%12s\n",
               "By replicas:", "1x", "2x", "3x", "4x");
 
-       for (j = BCH_DATA_BTREE; j < BCH_DATA_NR; j++) {
+       for (j = BCH_DATA_SB; j < BCH_DATA_NR; j++) {
                printf_pad(20, "  %s:", bch2_data_types[j]);
 
                for (i = 0; i < BCH_REPLICAS_MAX; i++)
@@ -57,37 +102,34 @@ static void print_fs_usage(const char *path, enum units units)
 
        printf("%-20s%12s\n", "  online reserved:", pr_units(u->fs.online_reserved, units));
 
+       darray(struct dev_by_label) devs_by_label;
+       darray_init(devs_by_label);
+
        for (i = 0; i < u->nr_devices; i++) {
                struct bch_ioctl_dev_usage *d = u->devs + i;
-               char *name = NULL;
 
                if (!d->alive)
                        continue;
 
-               printf("\n");
-               printf_pad(20, "Device %u usage:", i);
-               name = !d->dev ? strdup("(offline)")
-                       : dev_to_path(d->dev)
-                       ?: strdup("(device not found)");
-
-               printf("%24s%12s\n", name, bch2_dev_state[d->state]);
-               free(name);
-
-               printf("%-20s%12s%12s%12s\n",
-                      "", "data", "buckets", "fragmented");
-
-               for (j = BCH_DATA_SB; j < BCH_DATA_NR; j++) {
-                       u64 frag = max((s64) d->buckets[j] * d->bucket_size -
-                                      (s64) d->sectors[j], 0LL);
-
-                       printf_pad(20, "  %s:", bch2_data_types[j]);
-                       printf("%12s%12llu%12s\n",
-                              pr_units(d->sectors[j], units),
-                              d->buckets[j],
-                              pr_units(frag, units));
-               }
+               char *label_attr = mprintf("dev-%u/label", i);
+               char *label = read_file_str(fs.sysfs_fd, label_attr);
+               free(label_attr);
+
+               darray_append(devs_by_label,
+                       (struct dev_by_label) { i, label });
        }
 
+       sort(&darray_item(devs_by_label, 0), darray_size(devs_by_label),
+            sizeof(darray_item(devs_by_label, 0)), dev_by_label_cmp, NULL);
+
+       struct dev_by_label *d;
+       darray_foreach(d, devs_by_label)
+               print_dev_usage(u->devs + d->idx, d->idx, d->label, units);
+
+       darray_foreach(d, devs_by_label)
+               free(d->label);
+       darray_free(devs_by_label);
+
        free(u);
        bcache_fs_close(fs);
 }
@@ -95,7 +137,7 @@ static void print_fs_usage(const char *path, enum units units)
 int cmd_fs_usage(int argc, char *argv[])
 {
        enum units units = BYTES;
-       unsigned i;
+       char *fs;
        int opt;
 
        while ((opt = getopt(argc, argv, "h")) != -1)
@@ -104,12 +146,13 @@ int cmd_fs_usage(int argc, char *argv[])
                        units = HUMAN_READABLE;
                        break;
                }
+       args_shift(optind);
 
-       if (argc - optind < 1) {
+       if (!argc) {
                print_fs_usage(".", units);
        } else {
-               for (i = optind; i < argc; i++)
-                       print_fs_usage(argv[i], units);
+               while ((fs = arg_pop()))
+                       print_fs_usage(fs, units);
        }
 
        return 0;