Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

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

diff --git a/libbcachefs/fs.h b/libbcachefs/fs.h
index 9f4b57e30e2a7d14e8c66598c2203cbf970d319e..c3af7225ff693ec9c5af06502e22f3fbc8354fd5 100644 (file)
--- a/libbcachefs/fs.h
+++ b/libbcachefs/fs.h
@@ -6,50 +6,48 @@
 #include "opts.h"
 #include "str_hash.h"
 #include "quota_types.h"
+#include "two_state_shared_lock.h"
 
 #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;
+       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;
-
-       struct pagecache_lock   ei_pagecache_lock;
+       two_state_lock_t        ei_pagecache_lock;
 
        struct mutex            ei_quota_lock;
        struct bch_qid          ei_qid;
 
        u32                     ei_subvol;
 
+       /*
+        * When we've been doing nocow writes we'll need to issue flushes to the
+        * underlying block devices
+        *
+        * XXX: a device may have had a flush issued by some other codepath. It
+        * would be better to keep for each device a sequence number that's
+        * incremented when we isusue a cache flush, and track here the sequence
+        * number that needs flushing.
+        */
+       struct bch_devs_mask    ei_devs_need_flush;
+
        /* copy of inode in btree: */
        struct bch_inode_unpacked ei_inode;
 };
 
+#define bch2_pagecache_add_put(i)      bch2_two_state_unlock(&i->ei_pagecache_lock, 0)
+#define bch2_pagecache_add_tryget(i)   bch2_two_state_trylock(&i->ei_pagecache_lock, 0)
+#define bch2_pagecache_add_get(i)      bch2_two_state_lock(&i->ei_pagecache_lock, 0)
+
+#define bch2_pagecache_block_put(i)    bch2_two_state_unlock(&i->ei_pagecache_lock, 1)
+#define bch2_pagecache_block_get(i)    bch2_two_state_lock(&i->ei_pagecache_lock, 1)
+
 static inline subvol_inum inode_inum(struct bch_inode_info *inode)
 {
        return (subvol_inum) {
@@ -79,9 +77,8 @@ static inline int ptrcmp(void *l, void *r)
 }
 
 enum bch_inode_lock_op {
-       INODE_LOCK              = (1U << 0),
-       INODE_PAGECACHE_BLOCK   = (1U << 1),
-       INODE_UPDATE_LOCK       = (1U << 2),
+       INODE_PAGECACHE_BLOCK   = (1U << 0),
+       INODE_UPDATE_LOCK       = (1U << 1),
 };
 
 #define bch2_lock_inodes(_locks, ...)                                  \
@@ -93,10 +90,8 @@ do {                                                                 \
                                                                        \
        for (i = 1; i < ARRAY_SIZE(a); i++)                             \
                if (a[i] != a[i - 1]) {                                 \
-                       if ((_locks) & INODE_LOCK)                      \
-                               down_write_nested(&a[i]->v.i_rwsem, i); \
                        if ((_locks) & INODE_PAGECACHE_BLOCK)           \
-                               bch2_pagecache_block_get(&a[i]->ei_pagecache_lock);\
+                               bch2_pagecache_block_get(a[i]);\
                        if ((_locks) & INODE_UPDATE_LOCK)                       \
                                mutex_lock_nested(&a[i]->ei_update_lock, i);\
                }                                                       \
@@ -111,10 +106,8 @@ do {                                                                       \
                                                                        \
        for (i = 1; i < ARRAY_SIZE(a); i++)                             \
                if (a[i] != a[i - 1]) {                                 \
-                       if ((_locks) & INODE_LOCK)                      \
-                               up_write(&a[i]->v.i_rwsem);             \
                        if ((_locks) & INODE_PAGECACHE_BLOCK)           \
-                               bch2_pagecache_block_put(&a[i]->ei_pagecache_lock);\
+                               bch2_pagecache_block_put(a[i]);\
                        if ((_locks) & INODE_UPDATE_LOCK)                       \
                                mutex_unlock(&a[i]->ei_update_lock);    \
                }                                                       \
@@ -151,7 +144,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 *,
@@ -176,7 +169,8 @@ static inline int bch2_set_projid(struct bch_fs *c,
 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 *,
+typedef int (*inode_set_fn)(struct btree_trans *,
+                           struct bch_inode_info *,
                            struct bch_inode_unpacked *, void *);
 
 void bch2_inode_update_after_write(struct btree_trans *,
@@ -186,7 +180,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);
@@ -198,6 +192,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) {}