Merge https://github.com/YellowOnion/bcachefs-tools

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

diff --git a/libbcachefs/fs.h b/libbcachefs/fs.h
index 406056668516710ce2b2ff4bd1c1937a812415b2..27aacd7e28646544e3983fb0935580744b0400c6 100644 (file)
--- a/libbcachefs/fs.h
+++ b/libbcachefs/fs.h
@@ -10,23 +10,60 @@
 #include <linux/seqlock.h>
 #include <linux/stat.h>
 
+/*
+ * Two-state lock - can be taken for add or block - both states are shared,
+ * like read side of rwsem, but conflict with other state:
+ */
+struct pagecache_lock {
+       atomic_long_t           v;
+       wait_queue_head_t       wait;
+};
+
+static inline void pagecache_lock_init(struct pagecache_lock *lock)
+{
+       atomic_long_set(&lock->v, 0);
+       init_waitqueue_head(&lock->wait);
+}
+
+void bch2_pagecache_add_put(struct pagecache_lock *);
+bool bch2_pagecache_add_tryget(struct pagecache_lock *);
+void bch2_pagecache_add_get(struct pagecache_lock *);
+void bch2_pagecache_block_put(struct pagecache_lock *);
+void bch2_pagecache_block_get(struct pagecache_lock *);
+
 struct bch_inode_info {
        struct inode            v;
+       unsigned long           ei_flags;
 
        struct mutex            ei_update_lock;
-       u64                     ei_journal_seq;
        u64                     ei_quota_reserved;
        unsigned long           ei_last_dirtied;
 
+       struct pagecache_lock   ei_pagecache_lock;
+
        struct mutex            ei_quota_lock;
        struct bch_qid          ei_qid;
 
-       struct bch_hash_info    ei_str_hash;
+       u32                     ei_subvol;
 
        /* copy of inode in btree: */
        struct bch_inode_unpacked ei_inode;
 };
 
+static inline subvol_inum inode_inum(struct bch_inode_info *inode)
+{
+       return (subvol_inum) {
+               .subvol = inode->ei_subvol,
+               .inum   = inode->ei_inode.bi_inum,
+       };
+}
+
+/*
+ * Set if we've gotten a btree error for this inode, and thus the vfs inode and
+ * btree inode may be inconsistent:
+ */
+#define EI_INODE_ERROR                 0
+
 #define to_bch_ei(_inode)                                      \
        container_of_or_null(_inode, struct bch_inode_info, v)
 
@@ -37,7 +74,8 @@ static inline int ptrcmp(void *l, void *r)
 
 enum bch_inode_lock_op {
        INODE_LOCK              = (1U << 0),
-       INODE_UPDATE_LOCK       = (1U << 1),
+       INODE_PAGECACHE_BLOCK   = (1U << 1),
+       INODE_UPDATE_LOCK       = (1U << 2),
 };
 
 #define bch2_lock_inodes(_locks, ...)                                  \
@@ -49,9 +87,11 @@ do {                                                                 \
                                                                        \
        for (i = 1; i < ARRAY_SIZE(a); i++)                             \
                if (a[i] != a[i - 1]) {                                 \
-                       if (_locks & INODE_LOCK)                        \
+                       if ((_locks) & INODE_LOCK)                      \
                                down_write_nested(&a[i]->v.i_rwsem, i); \
-                       if (_locks & INODE_UPDATE_LOCK)                 \
+                       if ((_locks) & INODE_PAGECACHE_BLOCK)           \
+                               bch2_pagecache_block_get(&a[i]->ei_pagecache_lock);\
+                       if ((_locks) & INODE_UPDATE_LOCK)                       \
                                mutex_lock_nested(&a[i]->ei_update_lock, i);\
                }                                                       \
 } while (0)
@@ -65,9 +105,11 @@ do {                                                                        \
                                                                        \
        for (i = 1; i < ARRAY_SIZE(a); i++)                             \
                if (a[i] != a[i - 1]) {                                 \
-                       if (_locks & INODE_LOCK)                        \
+                       if ((_locks) & INODE_LOCK)                      \
                                up_write(&a[i]->v.i_rwsem);             \
-                       if (_locks & INODE_UPDATE_LOCK)                 \
+                       if ((_locks) & INODE_PAGECACHE_BLOCK)           \
+                               bch2_pagecache_block_put(&a[i]->ei_pagecache_lock);\
+                       if ((_locks) & INODE_UPDATE_LOCK)                       \
                                mutex_unlock(&a[i]->ei_update_lock);    \
                }                                                       \
 } while (0)
@@ -102,6 +144,10 @@ struct bch_inode_unpacked;
 
 #ifndef NO_BCACHEFS_FS
 
+struct bch_inode_info *
+__bch2_create(struct user_namespace *, struct bch_inode_info *,
+             struct dentry *, umode_t, dev_t, subvol_inum, unsigned);
+
 int bch2_fs_quota_transfer(struct bch_fs *,
                           struct bch_inode_info *,
                           struct bch_qid,
@@ -121,24 +167,33 @@ static inline int bch2_set_projid(struct bch_fs *c,
                                      KEY_TYPE_QUOTA_PREALLOC);
 }
 
-struct inode *bch2_vfs_inode_get(struct bch_fs *, u64);
+struct inode *bch2_vfs_inode_get(struct bch_fs *, subvol_inum);
 
 /* returns 0 if we want to do the update, or error is passed up */
 typedef int (*inode_set_fn)(struct bch_inode_info *,
                            struct bch_inode_unpacked *, void *);
 
-void bch2_inode_update_after_write(struct bch_fs *,
+void bch2_inode_update_after_write(struct btree_trans *,
                                   struct bch_inode_info *,
                                   struct bch_inode_unpacked *,
                                   unsigned);
 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 *,
+                        struct bch_inode_info *,
+                        struct iattr *);
+int __bch2_unlink(struct inode *, struct dentry *, bool);
+
+void bch2_evict_subvolume_inodes(struct bch_fs *, struct snapshot_id_list *);
+
 void bch2_vfs_exit(void);
 int bch2_vfs_init(void);
 
 #else
 
+static inline void bch2_evict_subvolume_inodes(struct bch_fs *c,
+                                              struct snapshot_id_list *s) {}
 static inline void bch2_vfs_exit(void) {}
 static inline int bch2_vfs_init(void) { return 0; }