New upstream release

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

diff --git a/libbcachefs/fs.h b/libbcachefs/fs.h
index 6b91bbe911162466063d00e4ec41889003d28ced..6170d214d6489720791edd25a3811c2274baa64b 100644 (file)
--- a/libbcachefs/fs.h
+++ b/libbcachefs/fs.h
@@ -13,12 +13,12 @@
 
 struct bch_inode_info {
        struct inode            v;
+       struct list_head        ei_vfs_inode_list;
        unsigned long           ei_flags;
 
        struct mutex            ei_update_lock;
        u64                     ei_quota_reserved;
        unsigned long           ei_last_dirtied;
-
        two_state_lock_t        ei_pagecache_lock;
 
        struct mutex            ei_quota_lock;
@@ -149,7 +149,7 @@ struct bch_inode_unpacked;
 #ifndef NO_BCACHEFS_FS
 
 struct bch_inode_info *
-__bch2_create(struct user_namespace *, struct bch_inode_info *,
+__bch2_create(struct mnt_idmap *, struct bch_inode_info *,
              struct dentry *, umode_t, dev_t, subvol_inum, unsigned);
 
 int bch2_fs_quota_transfer(struct bch_fs *,
@@ -184,7 +184,7 @@ void bch2_inode_update_after_write(struct btree_trans *,
 int __must_check bch2_write_inode(struct bch_fs *, struct bch_inode_info *,
                                  inode_set_fn, void *, unsigned);
 
-int bch2_setattr_nonsize(struct user_namespace *,
+int bch2_setattr_nonsize(struct mnt_idmap *,
                         struct bch_inode_info *,
                         struct iattr *);
 int __bch2_unlink(struct inode *, struct dentry *, bool);
@@ -196,6 +196,8 @@ int bch2_vfs_init(void);
 
 #else
 
+#define bch2_inode_update_after_write(_trans, _inode, _inode_u, _fields)       do {} while (0)
+
 static inline void bch2_evict_subvolume_inodes(struct bch_fs *c,
                                               snapshot_id_list *s) {}
 static inline void bch2_vfs_exit(void) {}