Commit 9e243d3c authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: Kill journal_seq/gc args to bch2_dev_usage_update_m()

This is only used by gc (fsck).
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 3f59547e
...@@ -346,13 +346,12 @@ static inline struct bch_alloc_v4 bucket_m_to_alloc(struct bucket b) ...@@ -346,13 +346,12 @@ static inline struct bch_alloc_v4 bucket_m_to_alloc(struct bucket b)
} }
static void bch2_dev_usage_update_m(struct bch_fs *c, struct bch_dev *ca, static void bch2_dev_usage_update_m(struct bch_fs *c, struct bch_dev *ca,
struct bucket old, struct bucket new, struct bucket old, struct bucket new)
u64 journal_seq, bool gc)
{ {
bch2_dev_usage_update(c, ca, bch2_dev_usage_update(c, ca,
bucket_m_to_alloc(old), bucket_m_to_alloc(old),
bucket_m_to_alloc(new), bucket_m_to_alloc(new),
journal_seq, gc); 0, true);
} }
static inline int __update_replicas(struct bch_fs *c, static inline int __update_replicas(struct bch_fs *c,
...@@ -658,7 +657,7 @@ int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca, ...@@ -658,7 +657,7 @@ int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca,
err: err:
bucket_unlock(g); bucket_unlock(g);
if (!ret) if (!ret)
bch2_dev_usage_update_m(c, ca, old, new, 0, true); bch2_dev_usage_update_m(c, ca, old, new);
percpu_up_read(&c->mark_lock); percpu_up_read(&c->mark_lock);
return ret; return ret;
} }
...@@ -773,7 +772,6 @@ static int mark_stripe_bucket(struct btree_trans *trans, ...@@ -773,7 +772,6 @@ static int mark_stripe_bucket(struct btree_trans *trans,
unsigned flags) unsigned flags)
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
u64 journal_seq = trans->journal_res.seq;
const struct bch_stripe *s = bkey_s_c_to_stripe(k).v; const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;
unsigned nr_data = s->nr_blocks - s->nr_redundant; unsigned nr_data = s->nr_blocks - s->nr_redundant;
bool parity = ptr_idx >= nr_data; bool parity = ptr_idx >= nr_data;
...@@ -820,7 +818,7 @@ static int mark_stripe_bucket(struct btree_trans *trans, ...@@ -820,7 +818,7 @@ static int mark_stripe_bucket(struct btree_trans *trans,
err: err:
bucket_unlock(g); bucket_unlock(g);
if (!ret) if (!ret)
bch2_dev_usage_update_m(c, ca, old, new, journal_seq, true); bch2_dev_usage_update_m(c, ca, old, new);
percpu_up_read(&c->mark_lock); percpu_up_read(&c->mark_lock);
printbuf_exit(&buf); printbuf_exit(&buf);
return ret; return ret;
...@@ -859,7 +857,6 @@ static int bch2_mark_pointer(struct btree_trans *trans, ...@@ -859,7 +857,6 @@ static int bch2_mark_pointer(struct btree_trans *trans,
s64 sectors, s64 sectors,
unsigned flags) unsigned flags)
{ {
u64 journal_seq = trans->journal_res.seq;
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
struct bch_dev *ca = bch_dev_bkey_exists(c, p.ptr.dev); struct bch_dev *ca = bch_dev_bkey_exists(c, p.ptr.dev);
struct bucket old, new, *g; struct bucket old, new, *g;
...@@ -886,7 +883,7 @@ static int bch2_mark_pointer(struct btree_trans *trans, ...@@ -886,7 +883,7 @@ static int bch2_mark_pointer(struct btree_trans *trans,
new = *g; new = *g;
bucket_unlock(g); bucket_unlock(g);
if (!ret) if (!ret)
bch2_dev_usage_update_m(c, ca, old, new, journal_seq, true); bch2_dev_usage_update_m(c, ca, old, new);
percpu_up_read(&c->mark_lock); percpu_up_read(&c->mark_lock);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment