bcachefs: Don't open code closure_nr_remaining()

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

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 986dd541435a0fcb4ef6ccacce44857147b98d93..c741150e68af971d144e752df543078bf1396bf8 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -2385,7 +2385,7 @@ void bch2_btree_updates_to_text(struct printbuf *out, struct bch_fs *c)
                       as,
                       as->mode,
                       as->nodes_written,
-                      atomic_read(&as->cl.remaining) & CLOSURE_REMAINING_MASK,
+                      closure_nr_remaining(&as->cl),
                       as->journal.seq);
        mutex_unlock(&c->btree_interior_update_lock);
 }

diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index cfc6244637009b0676ba735d179b199ae995879b..81518f20d37df41cad9ef15301844b310f2968ca 100644 (file)
--- a/fs/bcachefs/data_update.c
+++ b/fs/bcachefs/data_update.c
@@ -415,7 +415,7 @@ void bch2_update_unwritten_extent(struct btree_trans *trans,
                        break;
        }
 
-       if ((atomic_read(&cl.remaining) & CLOSURE_REMAINING_MASK) != 1) {
+       if (closure_nr_remaining(&cl) != 1) {
                bch2_trans_unlock(trans);
                closure_sync(&cl);
        }

diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 499585d7cc5d3bb8192e91fcfdcf6b685ac801c5..a3dc944d63cf3a86ad6759814e315c8765dd3bde 100644 (file)
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -478,7 +478,7 @@ retry:
        ret = bch2_extent_update(trans, inum, iter, new.k, &disk_res,
                                 0, i_sectors_delta, true);
 out:
-       if ((atomic_read(&cl.remaining) & CLOSURE_REMAINING_MASK) != 1) {
+       if (closure_nr_remaining(&cl) != 1) {
                bch2_trans_unlock(trans);
                closure_sync(&cl);
        }