iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix move path when move_stats == NULL

Browse Source 
This isn't done very often, but it is legitimate

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-06-29 17:14:06 -04:00 committed by Kent Overstreet
parent 4081ace307
commit 7c0732b88d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/bcachefs/move.c
View File

@ -140,13 +140,15 @@ void bch2_moving_ctxt_exit(struct moving_context *ctxt)
{ {
move_ctxt_wait_event(ctxt, NULL, list_empty(&ctxt->reads)); move_ctxt_wait_event(ctxt, NULL, list_empty(&ctxt->reads));
closure_sync(&ctxt->cl); closure_sync(&ctxt->cl);
progress_list_del(ctxt->c, ctxt->stats);
EBUG_ON(atomic_read(&ctxt->write_sectors)); EBUG_ON(atomic_read(&ctxt->write_sectors));
trace_move_data(ctxt->c, if (ctxt->stats) {
atomic64_read(&ctxt->stats->sectors_moved), progress_list_del(ctxt->c, ctxt->stats);
atomic64_read(&ctxt->stats->keys_moved));
trace_move_data(ctxt->c,
atomic64_read(&ctxt->stats->sectors_moved),
atomic64_read(&ctxt->stats->keys_moved));
}
} }
void bch2_moving_ctxt_init(struct moving_context *ctxt, void bch2_moving_ctxt_init(struct moving_context *ctxt,
@ -164,13 +166,14 @@ void bch2_moving_ctxt_init(struct moving_context *ctxt,
ctxt->wp = wp; ctxt->wp = wp;
ctxt->wait_on_copygc = wait_on_copygc; ctxt->wait_on_copygc = wait_on_copygc;
progress_list_add(c, stats);
closure_init_stack(&ctxt->cl); closure_init_stack(&ctxt->cl);
INIT_LIST_HEAD(&ctxt->reads); INIT_LIST_HEAD(&ctxt->reads);
init_waitqueue_head(&ctxt->wait); init_waitqueue_head(&ctxt->wait);
if (stats) if (stats) {
progress_list_add(c, stats);
stats->data_type = BCH_DATA_user; stats->data_type = BCH_DATA_user;
}
} }
void bch_move_stats_init(struct bch_move_stats *stats, char *name) void bch_move_stats_init(struct bch_move_stats *stats, char *name)