Update bcachefs sources to 5e392aed7a bcachefs: Kill bch2_alloc_write()

[bcachefs-tools-debian] / libbcachefs / disk_groups.c

diff --git a/libbcachefs/disk_groups.c b/libbcachefs/disk_groups.c
index 6c84297ef265f0810f71f3288a8d8fbab69e936e..81b41b07c24b21b1a2914234ba231b6977416180 100644 (file)
--- a/libbcachefs/disk_groups.c
+++ b/libbcachefs/disk_groups.c
@@ -76,8 +76,9 @@ static int bch2_sb_disk_groups_validate(struct bch_sb *sb,
        for (g = sorted; g + 1 < sorted + nr_groups; g++)
                if (!BCH_GROUP_DELETED(g) &&
                    !group_cmp(&g[0], &g[1])) {
-                       pr_buf(err, "duplicate label %llu.", BCH_GROUP_PARENT(g));
-                       bch_scnmemcpy(err, g->label, strnlen(g->label, sizeof(g->label)));
+                       pr_buf(err, "duplicate label %llu.%.*s",
+                              BCH_GROUP_PARENT(g),
+                              (int) sizeof(g->label), g->label);
                        goto err;
                }
 
@@ -342,12 +343,10 @@ int bch2_disk_path_find_or_create(struct bch_sb_handle *sb, const char *name)
        return v;
 }
 
-void bch2_disk_path_to_text(struct printbuf *out,
-                           struct bch_sb_handle *sb,
-                           unsigned v)
+void bch2_disk_path_to_text(struct printbuf *out, struct bch_sb *sb, unsigned v)
 {
        struct bch_sb_field_disk_groups *groups =
-               bch2_sb_get_disk_groups(sb->sb);
+               bch2_sb_get_disk_groups(sb);
        struct bch_disk_group *g;
        unsigned nr = 0;
        u16 path[32];
@@ -376,15 +375,13 @@ void bch2_disk_path_to_text(struct printbuf *out,
                v = path[--nr];
                g = groups->entries + v;
 
-               bch_scnmemcpy(out, g->label,
-                             strnlen(g->label, sizeof(g->label)));
-
+               pr_buf(out, "%.*s", (int) sizeof(g->label), g->label);
                if (nr)
                        pr_buf(out, ".");
        }
        return;
 inval:
-       pr_buf(out, "invalid group %u", v);
+       pr_buf(out, "invalid label %u", v);
 }
 
 int bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)
@@ -448,7 +445,10 @@ int bch2_opt_target_parse(struct bch_fs *c, const char *buf, u64 *v)
        return -EINVAL;
 }
 
-void bch2_opt_target_to_text(struct printbuf *out, struct bch_fs *c, u64 v)
+void bch2_opt_target_to_text(struct printbuf *out,
+                            struct bch_fs *c,
+                            struct bch_sb *sb,
+                            u64 v)
 {
        struct target t = target_decode(v);
 
@@ -456,33 +456,49 @@ void bch2_opt_target_to_text(struct printbuf *out, struct bch_fs *c, u64 v)
        case TARGET_NULL:
                pr_buf(out, "none");
                break;
-       case TARGET_DEV: {
-               struct bch_dev *ca;
-
-               rcu_read_lock();
-               ca = t.dev < c->sb.nr_devices
-                       ? rcu_dereference(c->devs[t.dev])
-                       : NULL;
-
-               if (ca && percpu_ref_tryget(&ca->io_ref)) {
-                       char b[BDEVNAME_SIZE];
-
-                       pr_buf(out, "/dev/%s",
-                            bdevname(ca->disk_sb.bdev, b));
-                       percpu_ref_put(&ca->io_ref);
-               } else if (ca) {
-                       pr_buf(out, "offline device %u", t.dev);
+       case TARGET_DEV:
+               if (c) {
+                       struct bch_dev *ca;
+
+                       rcu_read_lock();
+                       ca = t.dev < c->sb.nr_devices
+                               ? rcu_dereference(c->devs[t.dev])
+                               : NULL;
+
+                       if (ca && percpu_ref_tryget(&ca->io_ref)) {
+                               char b[BDEVNAME_SIZE];
+
+                               pr_buf(out, "/dev/%s",
+                                      bdevname(ca->disk_sb.bdev, b));
+                               percpu_ref_put(&ca->io_ref);
+                       } else if (ca) {
+                               pr_buf(out, "offline device %u", t.dev);
+                       } else {
+                               pr_buf(out, "invalid device %u", t.dev);
+                       }
+
+                       rcu_read_unlock();
                } else {
-                       pr_buf(out, "invalid device %u", t.dev);
+                       struct bch_sb_field_members *mi = bch2_sb_get_members(sb);
+                       struct bch_member *m = mi->members + t.dev;
+
+                       if (bch2_dev_exists(sb, mi, t.dev)) {
+                               pr_buf(out, "Device ");
+                               pr_uuid(out, m->uuid.b);
+                               pr_buf(out, " (%u)", t.dev);
+                       } else {
+                               pr_buf(out, "Bad device %u", t.dev);
+                       }
                }
-
-               rcu_read_unlock();
                break;
-       }
        case TARGET_GROUP:
-               mutex_lock(&c->sb_lock);
-               bch2_disk_path_to_text(out, &c->disk_sb, t.group);
-               mutex_unlock(&c->sb_lock);
+               if (c) {
+                       mutex_lock(&c->sb_lock);
+                       bch2_disk_path_to_text(out, c->disk_sb.sb, t.group);
+                       mutex_unlock(&c->sb_lock);
+               } else {
+                       bch2_disk_path_to_text(out, sb, t.group);
+               }
                break;
        default:
                BUG();