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 6170d214d6489720791edd25a3811c2274baa64b..c3af7225ff693ec9c5af06502e22f3fbc8354fd5 100644 (file)
--- a/libbcachefs/fs.h
+++ b/libbcachefs/fs.h
@@ -77,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, ...)                                  \
@@ -91,8 +90,6 @@ 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]);\
                        if ((_locks) & INODE_UPDATE_LOCK)                       \
@@ -109,8 +106,6 @@ 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]);\
                        if ((_locks) & INODE_UPDATE_LOCK)                       \
@@ -174,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 *,
@@ -196,7 +192,7 @@ int bch2_vfs_init(void);
 
 #else
 
-#define bch2_inode_update_after_write(_trans, _inode, _inode_u, _fields)       do {} while (0)
+#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) {}