bcachefs fs usage improvements

diff --git a/cmd_fs.c b/cmd_fs.c
index 967ac7a7f1c296bd16305ec1b65e082385c0b9d5..c5aeb7b76ea395edf8ec80fa09560e77ecafd374 100644 (file)
--- a/cmd_fs.c
+++ b/cmd_fs.c
@@ -4,12 +4,72 @@
 
 #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 void print_dev_usage(struct bch_ioctl_dev_usage *d, unsigned idx,
+                           const char *label, enum units units)
+{
+       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);
+
+       printf("%-20s%12s%12s%12s\n",
+              "", "data", "buckets", "fragmented");
+
+       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);
+
+               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)
 {
        unsigned i, j;
@@ -42,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);
 }

diff --git a/libbcachefs.c b/libbcachefs.c
index a6eb9889452fff8a2636eff57c842bd2369b68e3..3278645b8a1f5d41f46b3ac39acd0ccc5ff25c43 100644 (file)
--- a/libbcachefs.c
+++ b/libbcachefs.c
@@ -718,7 +718,8 @@ struct bchfs_handle bcache_fs_open(const char *path)
                ret.ioctl_fd = xopen(path, O_RDONLY);
 
                struct bch_ioctl_query_uuid uuid;
-               xioctl(ret.ioctl_fd, BCH_IOCTL_QUERY_UUID, &uuid);
+               if (ioctl(ret.ioctl_fd, BCH_IOCTL_QUERY_UUID, &uuid) < 0)
+                       die("error opening %s: not a bcachefs filesystem", path);
 
                ret.uuid = uuid.uuid;
 

diff --git a/tools-util.h b/tools-util.h
index e5edf98cf309bb59aedd31709e1ea707e30cf5dc..57f61e50cd2ecbdb9e6b400e810a3af93c6661d1 100644 (file)
--- a/tools-util.h
+++ b/tools-util.h
@@ -20,7 +20,8 @@
 #include "ccan/darray/darray.h"
 
 void die(const char *, ...);
-char *mprintf(const char *, ...);
+char *mprintf(const char *, ...)
+       __attribute__ ((format (printf, 1, 2)));
 void *xcalloc(size_t, size_t);
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);