diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-29 17:00:30 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-29 17:00:30 -0500 |
| commit | 89b361f24a433a4a55e0032eca4e43045ea3f0d0 (patch) | |
| tree | c405bc713dae3118593e2299de7fe18d7a291745 /libbcachefs/move.c | |
| parent | 1dc5842111fa587eb58112f4ae3c2048b1c1a006 (diff) | |
Update bcachefs sources to c3e4d892b77b mean and variance: Promote to lib/math
Diffstat (limited to 'libbcachefs/move.c')
| -rw-r--r-- | libbcachefs/move.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libbcachefs/move.c b/libbcachefs/move.c index db14ec37..3efe6a6e 100644 --- a/libbcachefs/move.c +++ b/libbcachefs/move.c @@ -70,7 +70,7 @@ struct moving_io { struct data_update write; /* Must be last since it is variable size */ - struct bio_vec bi_inline_vecs[0]; + struct bio_vec bi_inline_vecs[]; }; static void move_free(struct moving_io *io) @@ -345,7 +345,12 @@ err: if (ret == -BCH_ERR_data_update_done) return 0; - this_cpu_inc(c->counters[BCH_COUNTER_move_extent_start_fail]); + if (bch2_err_matches(ret, EROFS) || + bch2_err_matches(ret, BCH_ERR_transaction_restart)) + return ret; + + count_event(c, move_extent_start_fail); + if (trace_move_extent_start_fail_enabled()) { struct printbuf buf = PRINTBUF; @@ -461,7 +466,8 @@ int bch2_move_ratelimit(struct moving_context *ctxt) if (delay) move_ctxt_wait_event_timeout(ctxt, - freezing(current) || kthread_should_stop(), + freezing(current) || + kthread_should_stop(), delay); if (unlikely(freezing(current))) { @@ -680,6 +686,9 @@ int __bch2_evacuate_bucket(struct moving_context *ctxt, goto err; while (!(ret = bch2_move_ratelimit(ctxt))) { + if (kthread_should_stop()) + break; + bch2_trans_begin(trans); ret = bch2_get_next_backpointer(trans, bucket, gen, |