diff options
| author |  Kent Overstreet <kent.overstreet@linux.dev>
| 2023-08-12 16:51:45 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev>
| 2023-10-22 17:10:10 -0400 |
| commit | 93ee2c4b211b6fcfa0d796801372732a8214617c (patch) | |
| tree | 387defd4eee5d3e7b884c601e1557094bc6a9f2b /fs | |
| parent | bcachefs: Fix lifetime in bch2_write_done(), add assertion (diff) | |
| download | linux-93ee2c4b211b6fcfa0d796801372732a8214617c.tar.gz linux-93ee2c4b211b6fcfa0d796801372732a8214617c.tar.bz2 linux-93ee2c4b211b6fcfa0d796801372732a8214617c.zip | |
bcachefs: Don't open code closure_nr_remaining()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/data_update.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/io.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 986dd541435a..c741150e68af 100644 --- 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 cfc624463700..81518f20d37d 100644 --- 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 499585d7cc5d..a3dc944d63cf 100644 --- 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); } |