Update bcachefs sources to c6d45169c6 bcachefs: Convert split_devs() to darray

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

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index 0d0a37cad2d42b25433cd15b43bb52100244e9ee..01960b36cd4d894bfe6850febdf1bd9f7db38c49 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -998,15 +998,13 @@ static int bch2_vfs_readdir(struct file *file, struct dir_context *ctx)
 {
        struct bch_inode_info *inode = file_bch_inode(file);
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
-       int ret;
 
        if (!dir_emit_dots(file, ctx))
                return 0;
 
-       ret = bch2_readdir(c, inode_inum(inode), ctx);
-       if (ret)
-               bch_err_fn(c, ret);
+       int ret = bch2_readdir(c, inode_inum(inode), ctx);
 
+       bch_err_fn(c, ret);
        return bch2_err_class(ret);
 }
 
@@ -1143,24 +1141,33 @@ static int bch2_encode_fh(struct inode *vinode, u32 *fh, int *len,
 {
        struct bch_inode_info *inode    = to_bch_ei(vinode);
        struct bch_inode_info *dir      = to_bch_ei(vdir);
-
-       if (*len < sizeof(struct bcachefs_fid_with_parent) / sizeof(u32))
-               return FILEID_INVALID;
+       int min_len;
 
        if (!S_ISDIR(inode->v.i_mode) && dir) {
                struct bcachefs_fid_with_parent *fid = (void *) fh;
 
+               min_len = sizeof(*fid) / sizeof(u32);
+               if (*len < min_len) {
+                       *len = min_len;
+                       return FILEID_INVALID;
+               }
+
                fid->fid = bch2_inode_to_fid(inode);
                fid->dir = bch2_inode_to_fid(dir);
 
-               *len = sizeof(*fid) / sizeof(u32);
+               *len = min_len;
                return FILEID_BCACHEFS_WITH_PARENT;
        } else {
                struct bcachefs_fid *fid = (void *) fh;
 
+               min_len = sizeof(*fid) / sizeof(u32);
+               if (*len < min_len) {
+                       *len = min_len;
+                       return FILEID_INVALID;
+               }
                *fid = bch2_inode_to_fid(inode);
 
-               *len = sizeof(*fid) / sizeof(u32);
+               *len = min_len;
                return FILEID_BCACHEFS_WITHOUT_PARENT;
        }
 }
@@ -1463,7 +1470,7 @@ static void bch2_evict_inode(struct inode *vinode)
 
 void bch2_evict_subvolume_inodes(struct bch_fs *c, snapshot_id_list *s)
 {
-       struct bch_inode_info *inode, **i;
+       struct bch_inode_info *inode;
        DARRAY(struct bch_inode_info *) grabbed;
        bool clean_pass = false, this_pass_clean;
 
@@ -1589,31 +1596,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;
@@ -1659,11 +1641,9 @@ err:
 static int bch2_show_devname(struct seq_file *seq, struct dentry *root)
 {
        struct bch_fs *c = root->d_sb->s_fs_info;
-       struct bch_dev *ca;
-       unsigned i;
        bool first = true;
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                if (!first)
                        seq_putc(seq, ':');
                first = false;
@@ -1733,6 +1713,9 @@ static int bch2_unfreeze(struct super_block *sb)
        struct bch_fs *c = sb->s_fs_info;
        int ret;
 
+       if (test_bit(BCH_FS_emergency_ro, &c->flags))
+               return 0;
+
        down_write(&c->state_lock);
        ret = bch2_fs_read_write(c);
        up_write(&c->state_lock);
@@ -1765,17 +1748,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;
 }
@@ -1784,13 +1768,9 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type,
                                 int flags, const char *dev_name, void *data)
 {
        struct bch_fs *c;
-       struct bch_dev *ca;
        struct super_block *sb;
        struct inode *vinode;
        struct bch_opts opts = bch2_opts_empty();
-       char **devs;
-       struct bch_fs **devs_to_fs = NULL;
-       unsigned i, nr_devs;
        int ret;
 
        opt_set(opts, read_only, (flags & SB_RDONLY) != 0);
@@ -1802,25 +1782,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 (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;
@@ -1840,9 +1820,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);
@@ -1883,7 +1862,7 @@ got_sb:
 
        sb->s_bdi->ra_pages             = VM_READAHEAD_PAGES;
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                struct block_device *bdev = ca->disk_sb.bdev;
 
                /* XXX: create an anonymous device for multi device filesystems */
@@ -1904,10 +1883,9 @@ got_sb:
 
        vinode = bch2_vfs_inode_get(c, BCACHEFS_ROOT_SUBVOL_INUM);
        ret = PTR_ERR_OR_ZERO(vinode);
-       if (ret) {
-               bch_err_msg(c, ret, "mounting: error getting root inode");
+       bch_err_msg(c, ret, "mounting: error getting root inode");
+       if (ret)
                goto err_put_super;
-       }
 
        sb->s_root = d_make_root(vinode);
        if (!sb->s_root) {