bcachefs: bch2_btree_bit_mod -> bch2_btree_bit_mod_buffered

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c
index c3ff365acce9afeae894c69003d247bef9c8e955..390daa4b15b20605258f5a984fb38d33decd4ec0 100644 (file)
--- a/fs/bcachefs/btree_update.c
+++ b/fs/bcachefs/btree_update.c
@@ -785,8 +785,8 @@ int bch2_btree_delete_range(struct bch_fs *c, enum btree_id id,
        return ret;
 }
 
-int bch2_btree_bit_mod(struct btree_trans *trans, enum btree_id btree,
-                      struct bpos pos, bool set)
+int bch2_btree_bit_mod_buffered(struct btree_trans *trans, enum btree_id btree,
+                               struct bpos pos, bool set)
 {
        struct bkey_i k;
 

diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index b9382b7b288b6a6189d191886511a3ee57187634..75ffd82e0fc4939f9e86fa25b22d033ae86abdc6 100644 (file)
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -62,12 +62,12 @@ int bch2_btree_delete_range_trans(struct btree_trans *, enum btree_id,
 int bch2_btree_delete_range(struct bch_fs *, enum btree_id,
                            struct bpos, struct bpos, unsigned, u64 *);
 
-int bch2_btree_bit_mod(struct btree_trans *, enum btree_id, struct bpos, bool);
+int bch2_btree_bit_mod_buffered(struct btree_trans *, enum btree_id, struct bpos, bool);
 
 static inline int bch2_btree_delete_at_buffered(struct btree_trans *trans,
                                                enum btree_id btree, struct bpos pos)
 {
-       return bch2_btree_bit_mod(trans, btree, pos, false);
+       return bch2_btree_bit_mod_buffered(trans, btree, pos, false);
 }
 
 int __bch2_insert_snapshot_whiteouts(struct btree_trans *, enum btree_id,

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 7dca10ba70d253fe1e0619e738ea7826d1ea1ca1..c2f46b267b3ad50c796690320f0a700411940931 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1053,7 +1053,8 @@ int bch2_trigger_extent(struct btree_trans *trans,
                          (int) bch2_bkey_needs_rebalance(c, old);
 
                if (mod) {
-                       int ret = bch2_btree_bit_mod(trans, BTREE_ID_rebalance_work, new.k->p, mod > 0);
+                       int ret = bch2_btree_bit_mod_buffered(trans, BTREE_ID_rebalance_work,
+                                                             new.k->p, mod > 0);
                        if (ret)
                                return ret;
                }

diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c
index 418d731b47d217bdfff1e9766460a2bcf4a40269..a3139bb66f77e280d76e88e0bb61c9f732eccc7c 100644 (file)
--- a/fs/bcachefs/inode.c
+++ b/fs/bcachefs/inode.c
@@ -620,7 +620,8 @@ int bch2_trigger_inode(struct btree_trans *trans,
                bool old_deleted = bkey_is_deleted_inode(old);
                bool new_deleted = bkey_is_deleted_inode(new.s_c);
                if (old_deleted != new_deleted) {
-                       int ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, new.k->p, new_deleted);
+                       int ret = bch2_btree_bit_mod_buffered(trans, BTREE_ID_deleted_inodes,
+                                                             new.k->p, new_deleted);
                        if (ret)
                                return ret;
                }
@@ -1170,7 +1171,7 @@ fsck_err:
        bch2_trans_iter_exit(trans, &inode_iter);
        return ret;
 delete:
-       ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, pos, false);
+       ret = bch2_btree_bit_mod_buffered(trans, BTREE_ID_deleted_inodes, pos, false);
        goto out;
 }
 

diff --git a/fs/bcachefs/lru.c b/fs/bcachefs/lru.c
index 7a4ca5a28b3eac83ead3d5e585e8886db5c456c9..ed7577cdb2124c946b54fef45b265d99126032e1 100644 (file)
--- a/fs/bcachefs/lru.c
+++ b/fs/bcachefs/lru.c
@@ -44,8 +44,8 @@ static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
                          u64 dev_bucket, u64 time, bool set)
 {
        return time
-               ? bch2_btree_bit_mod(trans, BTREE_ID_lru,
-                                    lru_pos(lru_id, dev_bucket, time), set)
+               ? bch2_btree_bit_mod_buffered(trans, BTREE_ID_lru,
+                                             lru_pos(lru_id, dev_bucket, time), set)
                : 0;
 }