bcachefs: Convert split_devs() to darray

Bit of cleanup & modernization: also moving this code to util.c, it'll
be used by userspace as well.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/darray.h b/fs/bcachefs/darray.h
index c7f153cecde3ca395e72329e29553781778b7d5f..4b340d13caace03b12f75e788316ad5af7e08d1c 100644 (file)
--- a/fs/bcachefs/darray.h
+++ b/fs/bcachefs/darray.h
@@ -20,6 +20,7 @@ struct {                                                              \
 #define DARRAY(_type) DARRAY_PREALLOCATED(_type, 0)
 
 typedef DARRAY(char)   darray_char;
+typedef DARRAY(char *) darray_str;
 
 int __bch2_darray_resize(darray_char *, size_t, size_t, gfp_t);
 

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index b1c89ed1bf46ac85e88e8628f0c866a839aa783b..12de97bc93b990428e20cd6b004fee0d0ff4592e 100644 (file)
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -1624,31 +1624,6 @@ static struct bch_fs *bch2_path_to_fs(const char *path)
        return c ?: ERR_PTR(-ENOENT);
 }
 
-static char **split_devs(const char *_dev_name, unsigned *nr)
-{
-       char *dev_name = NULL, **devs = NULL, *s;
-       size_t i = 0, nr_devs = 0;
-
-       dev_name = kstrdup(_dev_name, GFP_KERNEL);
-       if (!dev_name)
-               return NULL;
-
-       for (s = dev_name; s; s = strchr(s + 1, ':'))
-               nr_devs++;
-
-       devs = kcalloc(nr_devs + 1, sizeof(const char *), GFP_KERNEL);
-       if (!devs) {
-               kfree(dev_name);
-               return NULL;
-       }
-
-       while ((s = strsep(&dev_name, ":")))
-               devs[i++] = s;
-
-       *nr = nr_devs;
-       return devs;
-}
-
 static int bch2_remount(struct super_block *sb, int *flags, char *data)
 {
        struct bch_fs *c = sb->s_fs_info;
@@ -1801,17 +1776,18 @@ static int bch2_noset_super(struct super_block *s, void *data)
        return -EBUSY;
 }
 
+typedef DARRAY(struct bch_fs *) darray_fs;
+
 static int bch2_test_super(struct super_block *s, void *data)
 {
        struct bch_fs *c = s->s_fs_info;
-       struct bch_fs **devs = data;
-       unsigned i;
+       darray_fs *d = data;
 
        if (!c)
                return false;
 
-       for (i = 0; devs[i]; i++)
-               if (c != devs[i])
+       darray_for_each(*d, i)
+               if (c != *i)
                        return false;
        return true;
 }
@@ -1823,9 +1799,6 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type,
        struct super_block *sb;
        struct inode *vinode;
        struct bch_opts opts = bch2_opts_empty();
-       char **devs;
-       struct bch_fs **devs_to_fs = NULL;
-       unsigned nr_devs;
        int ret;
 
        opt_set(opts, read_only, (flags & SB_RDONLY) != 0);
@@ -1837,25 +1810,25 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type,
        if (!dev_name || strlen(dev_name) == 0)
                return ERR_PTR(-EINVAL);
 
-       devs = split_devs(dev_name, &nr_devs);
-       if (!devs)
-               return ERR_PTR(-ENOMEM);
+       darray_str devs;
+       ret = bch2_split_devs(dev_name, &devs);
+       if (ret)
+               return ERR_PTR(ret);
 
-       devs_to_fs = kcalloc(nr_devs + 1, sizeof(void *), GFP_KERNEL);
-       if (!devs_to_fs) {
-               sb = ERR_PTR(-ENOMEM);
-               goto got_sb;
+       darray_fs devs_to_fs = {};
+       darray_for_each(devs, i) {
+               ret = darray_push(&devs_to_fs, bch2_path_to_fs(*i));
+               if (ret) {
+                       sb = ERR_PTR(ret);
+                       goto got_sb;
+               }
        }
 
-       for (unsigned i = 0; i < nr_devs; i++)
-               devs_to_fs[i] = bch2_path_to_fs(devs[i]);
-
-       sb = sget(fs_type, bch2_test_super, bch2_noset_super,
-                 flags|SB_NOSEC, devs_to_fs);
+       sb = sget(fs_type, bch2_test_super, bch2_noset_super, flags|SB_NOSEC, &devs_to_fs);
        if (!IS_ERR(sb))
                goto got_sb;
 
-       c = bch2_fs_open(devs, nr_devs, opts);
+       c = bch2_fs_open(devs.data, devs.nr, opts);
        if (IS_ERR(c)) {
                sb = ERR_CAST(c);
                goto got_sb;
@@ -1875,9 +1848,8 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type,
        if (IS_ERR(sb))
                bch2_fs_stop(c);
 got_sb:
-       kfree(devs_to_fs);
-       kfree(devs[0]);
-       kfree(devs);
+       darray_exit(&devs_to_fs);
+       bch2_darray_str_exit(&devs);
 
        if (IS_ERR(sb)) {
                ret = PTR_ERR(sb);

diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index d530277f9017ac0a20def4101900ddd67993cb75..2e4c5d9606decbd3375d9124e50b3a2ef2f45135 100644 (file)
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -1174,3 +1174,37 @@ u64 *bch2_acc_percpu_u64s(u64 __percpu *p, unsigned nr)
 
        return ret;
 }
+
+void bch2_darray_str_exit(darray_str *d)
+{
+       darray_for_each(*d, i)
+               kfree(*i);
+       darray_exit(d);
+}
+
+int bch2_split_devs(const char *_dev_name, darray_str *ret)
+{
+       darray_init(ret);
+
+       char *dev_name = kstrdup(_dev_name, GFP_KERNEL), *s = dev_name;
+       if (!dev_name)
+               return -ENOMEM;
+
+       while ((s = strsep(&dev_name, ":"))) {
+               char *p = kstrdup(s, GFP_KERNEL);
+               if (!p)
+                       goto err;
+
+               if (darray_push(ret, p)) {
+                       kfree(p);
+                       goto err;
+               }
+       }
+
+       kfree(dev_name);
+       return 0;
+err:
+       bch2_darray_str_exit(ret);
+       kfree(dev_name);
+       return -ENOMEM;
+}

diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h
index 1ff063bb87416a83fd0823e62e044eabe7a6204f..4290e0a53b7563a4e6d912ce17083a947b6a3f4b 100644 (file)
--- a/fs/bcachefs/util.h
+++ b/fs/bcachefs/util.h
@@ -863,4 +863,7 @@ static inline bool qstr_eq(const struct qstr l, const struct qstr r)
        return l.len == r.len && !memcmp(l.name, r.name, l.len);
 }
 
+void bch2_darray_str_exit(darray_str *);
+int bch2_split_devs(const char *, darray_str *);
+
 #endif /* _BCACHEFS_UTIL_H */