diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-04 14:31:50 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-05 16:42:02 -0500 |
| commit | a6dbb8c461c1449b11e35aa57c4d01eb1c1057fd (patch) | |
| tree | 342314e968cbf6df4652ab87f56ee4265e8fd98c | |
| parent | 0e3adb08a37c07ffa211f3f42307c9385fc18532 (diff) | |
fixup! bcachefs: Convert bch2_do_discards_work() to for_each_btree_key2()
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 5880f2757518..54765206a1a6 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -989,7 +989,6 @@ static int bch2_discard_one_bucket(struct btree_trans *trans, struct bch_dev *ca; struct bkey_i_alloc_v4 *a; struct printbuf buf = PRINTBUF; - bool did_discard = false; int ret = 0; ca = bch_dev_bkey_exists(c, pos.inode); @@ -1058,15 +1057,13 @@ static int bch2_discard_one_bucket(struct btree_trans *trans, k.k->p.offset * ca->mi.bucket_size, ca->mi.bucket_size, GFP_KERNEL); + *discard_pos_done = iter.pos; ret = bch2_trans_relock_notrace(trans); if (ret) goto out; } - *discard_pos_done = iter.pos; - did_discard = true; - SET_BCH_ALLOC_V4_NEED_DISCARD(&a->v, false); a->v.data_type = alloc_data_type(a->v, a->v.data_type); write: @@ -1076,10 +1073,8 @@ write: if (ret) goto out; - if (did_discard) { - this_cpu_inc(c->counters[BCH_COUNTER_bucket_discard]); - (*discarded)++; - } + this_cpu_inc(c->counters[BCH_COUNTER_bucket_discard]); + (*discarded)++; out: (*seen)++; bch2_trans_iter_exit(trans, &iter); |