Update bcachefs sources to 676dd269f0f8 mean and variance: Promote to lib/math

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

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index 1354af2cb85c47d61392a3b04d72dbb3d359e7a1..0d0a37cad2d42b25433cd15b43bb52100244e9ee 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -66,11 +66,11 @@ void bch2_inode_update_after_write(struct btree_trans *trans,
        inode->v.i_mode = bi->bi_mode;
 
        if (fields & ATTR_ATIME)
-               inode->v.i_atime = bch2_time_to_timespec(c, bi->bi_atime);
+               inode_set_atime_to_ts(&inode->v, bch2_time_to_timespec(c, bi->bi_atime));
        if (fields & ATTR_MTIME)
-               inode->v.i_mtime = bch2_time_to_timespec(c, bi->bi_mtime);
+               inode_set_mtime_to_ts(&inode->v, bch2_time_to_timespec(c, bi->bi_mtime));
        if (fields & ATTR_CTIME)
-               inode->v.i_ctime = bch2_time_to_timespec(c, bi->bi_ctime);
+               inode_set_ctime_to_ts(&inode->v, bch2_time_to_timespec(c, bi->bi_ctime));
 
        inode->ei_inode         = *bi;
 
@@ -93,7 +93,7 @@ retry:
                                BTREE_ITER_INTENT) ?:
                (set ? set(trans, inode, &inode_u, p) : 0) ?:
                bch2_inode_write(trans, &iter, &inode_u) ?:
-               bch2_trans_commit(trans, NULL, NULL, BTREE_INSERT_NOFAIL);
+               bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);
 
        /*
         * the btree node lock protects inode->ei_inode, not ei_update_lock;
@@ -452,7 +452,7 @@ int __bch2_unlink(struct inode *vdir, struct dentry *dentry,
        bch2_lock_inodes(INODE_UPDATE_LOCK, dir, inode);
 
        ret = commit_do(trans, NULL, NULL,
-                       BTREE_INSERT_NOFAIL,
+                       BCH_TRANS_COMMIT_no_enospc,
                bch2_unlink_trans(trans,
                                  inode_inum(dir), &dir_u,
                                  &inode_u, &dentry->d_name,
@@ -717,7 +717,7 @@ retry:
 
        ret =   bch2_inode_write(trans, &inode_iter, &inode_u) ?:
                bch2_trans_commit(trans, NULL, NULL,
-                                 BTREE_INSERT_NOFAIL);
+                                 BCH_TRANS_COMMIT_no_enospc);
 btree_err:
        bch2_trans_iter_exit(trans, &inode_iter);
 
@@ -753,9 +753,9 @@ static int bch2_getattr(struct mnt_idmap *idmap,
        stat->gid       = inode->v.i_gid;
        stat->rdev      = inode->v.i_rdev;
        stat->size      = i_size_read(&inode->v);
-       stat->atime     = inode->v.i_atime;
-       stat->mtime     = inode->v.i_mtime;
-       stat->ctime     = inode->v.i_ctime;
+       stat->atime     = inode_get_atime(&inode->v);
+       stat->mtime     = inode_get_mtime(&inode->v);
+       stat->ctime     = inode_get_ctime(&inode->v);
        stat->blksize   = block_bytes(c);
        stat->blocks    = inode->v.i_blocks;
 
@@ -764,15 +764,15 @@ static int bch2_getattr(struct mnt_idmap *idmap,
                stat->btime = bch2_time_to_timespec(c, inode->ei_inode.bi_otime);
        }
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_IMMUTABLE)
+       if (inode->ei_inode.bi_flags & BCH_INODE_immutable)
                stat->attributes |= STATX_ATTR_IMMUTABLE;
        stat->attributes_mask    |= STATX_ATTR_IMMUTABLE;
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_APPEND)
+       if (inode->ei_inode.bi_flags & BCH_INODE_append)
                stat->attributes |= STATX_ATTR_APPEND;
        stat->attributes_mask    |= STATX_ATTR_APPEND;
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_NODUMP)
+       if (inode->ei_inode.bi_flags & BCH_INODE_nodump)
                stat->attributes |= STATX_ATTR_NODUMP;
        stat->attributes_mask    |= STATX_ATTR_NODUMP;
 
@@ -1213,9 +1213,6 @@ static struct dentry *bch2_get_parent(struct dentry *child)
                .inum = inode->ei_inode.bi_dir,
        };
 
-       if (!parent_inum.inum)
-               return NULL;
-
        return d_obtain_alias(bch2_vfs_inode_get(c, parent_inum));
 }
 
@@ -1418,9 +1415,9 @@ static int inode_update_times_fn(struct btree_trans *trans,
 {
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
 
-       bi->bi_atime    = timespec_to_bch2_time(c, inode->v.i_atime);
-       bi->bi_mtime    = timespec_to_bch2_time(c, inode->v.i_mtime);
-       bi->bi_ctime    = timespec_to_bch2_time(c, inode->v.i_ctime);
+       bi->bi_atime    = timespec_to_bch2_time(c, inode_get_atime(&inode->v));
+       bi->bi_mtime    = timespec_to_bch2_time(c, inode_get_mtime(&inode->v));
+       bi->bi_ctime    = timespec_to_bch2_time(c, inode_get_ctime(&inode->v));
 
        return 0;
 }
@@ -1595,7 +1592,7 @@ static struct bch_fs *bch2_path_to_fs(const char *path)
 static char **split_devs(const char *_dev_name, unsigned *nr)
 {
        char *dev_name = NULL, **devs = NULL, *s;
-       size_t i, nr_devs = 0;
+       size_t i = 0, nr_devs = 0;
 
        dev_name = kstrdup(_dev_name, GFP_KERNEL);
        if (!dev_name)
@@ -1610,9 +1607,7 @@ static char **split_devs(const char *_dev_name, unsigned *nr)
                return NULL;
        }
 
-       for (i = 0, s = dev_name;
-            s;
-            (s = strchr(s, ':')) && (*s++ = '\0'))
+       while ((s = strsep(&dev_name, ":")))
                devs[i++] = s;
 
        *nr = nr_devs;
@@ -1672,8 +1667,7 @@ static int bch2_show_devname(struct seq_file *seq, struct dentry *root)
                if (!first)
                        seq_putc(seq, ':');
                first = false;
-               seq_puts(seq, "/dev/");
-               seq_puts(seq, ca->name);
+               seq_puts(seq, ca->disk_sb.sb_name);
        }
 
        return 0;
@@ -1906,7 +1900,7 @@ got_sb:
                sb->s_flags     |= SB_POSIXACL;
 #endif
 
-       sb->s_shrink.seeks = 0;
+       sb->s_shrink->seeks = 0;
 
        vinode = bch2_vfs_inode_get(c, BCACHEFS_ROOT_SUBVOL_INUM);
        ret = PTR_ERR_OR_ZERO(vinode);
@@ -1927,10 +1921,7 @@ out:
        return dget(sb->s_root);
 
 err_put_super:
-       sb->s_fs_info = NULL;
-       c->vfs_sb = NULL;
        deactivate_locked_super(sb);
-       bch2_fs_stop(c);
        return ERR_PTR(bch2_err_class(ret));
 }
 
@@ -1938,11 +1929,8 @@ static void bch2_kill_sb(struct super_block *sb)
 {
        struct bch_fs *c = sb->s_fs_info;
 
-       if (c)
-               c->vfs_sb = NULL;
        generic_shutdown_super(sb);
-       if (c)
-               bch2_fs_free(c);
+       bch2_fs_free(c);
 }
 
 static struct file_system_type bcache_fs_type = {