Update bcachefs sources to d267e10a43b2 bcachefs: __bch2_sb_field_to_text()

[bcachefs-tools-debian] / libbcachefs / inode.c

diff --git a/libbcachefs/inode.c b/libbcachefs/inode.c
index 7ee9ac5e447960b2f66fd1e9a9a59650b1944de5..37dce96f48ac42d28b98d99e75a77b049e04de8f 100644 (file)
--- a/libbcachefs/inode.c
+++ b/libbcachefs/inode.c
@@ -561,64 +561,46 @@ static inline bool bkey_is_deleted_inode(struct bkey_s_c k)
        return bkey_inode_flags(k) & BCH_INODE_unlinked;
 }
 
-int bch2_trans_mark_inode(struct btree_trans *trans,
-                         enum btree_id btree_id, unsigned level,
-                         struct bkey_s_c old,
-                         struct bkey_i *new,
-                         unsigned flags)
+int bch2_trigger_inode(struct btree_trans *trans,
+                      enum btree_id btree_id, unsigned level,
+                      struct bkey_s_c old,
+                      struct bkey_s new,
+                      unsigned flags)
 {
-       int nr = bkey_is_inode(&new->k) - bkey_is_inode(old.k);
-       bool old_deleted = bkey_is_deleted_inode(old);
-       bool new_deleted = bkey_is_deleted_inode(bkey_i_to_s_c(new));
+       s64 nr = bkey_is_inode(new.k) - bkey_is_inode(old.k);
 
-       if (nr) {
-               int ret = bch2_replicas_deltas_realloc(trans, 0);
-               struct replicas_delta_list *d = trans->fs_usage_deltas;
+       if (flags & BTREE_TRIGGER_TRANSACTIONAL) {
+               if (nr) {
+                       int ret = bch2_replicas_deltas_realloc(trans, 0);
+                       if (ret)
+                               return ret;
 
-               if (ret)
-                       return ret;
-
-               d->nr_inodes += nr;
-       }
+                       trans->fs_usage_deltas->nr_inodes += nr;
+               }
 
-       if (old_deleted != new_deleted) {
-               int ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, new->k.p, new_deleted);
-               if (ret)
-                       return ret;
+               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);
+                       if (ret)
+                               return ret;
+               }
        }
 
-       return 0;
-}
-
-int bch2_mark_inode(struct btree_trans *trans,
-                   enum btree_id btree_id, unsigned level,
-                   struct bkey_s_c old, struct bkey_s_c new,
-                   unsigned flags)
-{
-       struct bch_fs *c = trans->c;
-       struct bch_fs_usage *fs_usage;
-       u64 journal_seq = trans->journal_res.seq;
-
-       if (flags & BTREE_TRIGGER_INSERT) {
-               struct bch_inode_v3 *v = (struct bch_inode_v3 *) new.v;
-
-               BUG_ON(!journal_seq);
-               BUG_ON(new.k->type != KEY_TYPE_inode_v3);
+       if (!(flags & BTREE_TRIGGER_TRANSACTIONAL) && (flags & BTREE_TRIGGER_INSERT)) {
+               BUG_ON(!trans->journal_res.seq);
 
-               v->bi_journal_seq = cpu_to_le64(journal_seq);
+               bkey_s_to_inode_v3(new).v->bi_journal_seq = cpu_to_le64(trans->journal_res.seq);
        }
 
        if (flags & BTREE_TRIGGER_GC) {
-               percpu_down_read(&c->mark_lock);
-               preempt_disable();
-
-               fs_usage = fs_usage_ptr(c, journal_seq, flags & BTREE_TRIGGER_GC);
-               fs_usage->nr_inodes += bkey_is_inode(new.k);
-               fs_usage->nr_inodes -= bkey_is_inode(old.k);
+               struct bch_fs *c = trans->c;
 
-               preempt_enable();
+               percpu_down_read(&c->mark_lock);
+               this_cpu_add(c->usage_gc->nr_inodes, nr);
                percpu_up_read(&c->mark_lock);
        }
+
        return 0;
 }
 
@@ -1155,8 +1137,6 @@ delete:
 int bch2_delete_dead_inodes(struct bch_fs *c)
 {
        struct btree_trans *trans = bch2_trans_get(c);
-       struct btree_iter iter;
-       struct bkey_s_c k;
        bool need_another_pass;
        int ret;
 again:
@@ -1200,6 +1180,5 @@ again:
        }
 err:
        bch2_trans_put(trans);
-
        return ret;
 }