Update bcachefs sources to 2a6125decb43 bcachefs: bch_sb_field_downgrade

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

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index 34cb22a9c05d6d8346b217b1836171f06c52d04a..da11757682c0967950e9e9ea7d1e4d862937d0ce 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -258,7 +258,8 @@ __bch2_create(struct mnt_idmap *idmap,
 retry:
        bch2_trans_begin(trans);
 
-       ret   = bch2_create_trans(trans,
+       ret   = bch2_subvol_is_ro_trans(trans, dir->ei_subvol) ?:
+               bch2_create_trans(trans,
                                  inode_inum(dir), &dir_u, &inode_u,
                                  !(flags & BCH_CREATE_TMPFILE)
                                  ? &dentry->d_name : NULL,
@@ -430,7 +431,9 @@ static int bch2_link(struct dentry *old_dentry, struct inode *vdir,
 
        lockdep_assert_held(&inode->v.i_rwsem);
 
-       ret = __bch2_link(c, inode, dir, dentry);
+       ret   = bch2_subvol_is_ro(c, dir->ei_subvol) ?:
+               bch2_subvol_is_ro(c, inode->ei_subvol) ?:
+               __bch2_link(c, inode, dir, dentry);
        if (unlikely(ret))
                return ret;
 
@@ -481,7 +484,11 @@ err:
 
 static int bch2_unlink(struct inode *vdir, struct dentry *dentry)
 {
-       return __bch2_unlink(vdir, dentry, false);
+       struct bch_inode_info *dir= to_bch_ei(vdir);
+       struct bch_fs *c = dir->v.i_sb->s_fs_info;
+
+       return bch2_subvol_is_ro(c, dir->ei_subvol) ?:
+               __bch2_unlink(vdir, dentry, false);
 }
 
 static int bch2_symlink(struct mnt_idmap *idmap,
@@ -562,6 +569,11 @@ static int bch2_rename2(struct mnt_idmap *idmap,
                         src_inode,
                         dst_inode);
 
+       ret   = bch2_subvol_is_ro_trans(trans, src_dir->ei_subvol) ?:
+               bch2_subvol_is_ro_trans(trans, dst_dir->ei_subvol);
+       if (ret)
+               goto err;
+
        if (inode_attr_changing(dst_dir, src_inode, Inode_opt_project)) {
                ret = bch2_fs_quota_transfer(c, src_inode,
                                             dst_dir->ei_qid,
@@ -783,11 +795,13 @@ static int bch2_setattr(struct mnt_idmap *idmap,
                        struct dentry *dentry, struct iattr *iattr)
 {
        struct bch_inode_info *inode = to_bch_ei(dentry->d_inode);
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
        int ret;
 
        lockdep_assert_held(&inode->v.i_rwsem);
 
-       ret = setattr_prepare(idmap, dentry, iattr);
+       ret   = bch2_subvol_is_ro(c, inode->ei_subvol) ?:
+               setattr_prepare(idmap, dentry, iattr);
        if (ret)
                return ret;
 
@@ -1008,12 +1022,26 @@ static int bch2_vfs_readdir(struct file *file, struct dir_context *ctx)
        return bch2_err_class(ret);
 }
 
+static int bch2_open(struct inode *vinode, struct file *file)
+{
+       if (file->f_flags & (O_WRONLY|O_RDWR)) {
+               struct bch_inode_info *inode = to_bch_ei(vinode);
+               struct bch_fs *c = inode->v.i_sb->s_fs_info;
+
+               int ret = bch2_subvol_is_ro(c, inode->ei_subvol);
+               if (ret)
+                       return ret;
+       }
+
+       return generic_file_open(vinode, file);
+}
+
 static const struct file_operations bch_file_operations = {
+       .open           = bch2_open,
        .llseek         = bch2_llseek,
        .read_iter      = bch2_read_iter,
        .write_iter     = bch2_write_iter,
        .mmap           = bch2_mmap,
-       .open           = generic_file_open,
        .fsync          = bch2_fsync,
        .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,