mirror of
https://github.com/torvalds/linux
synced 2024-07-23 19:49:59 +00:00
bcachefs fixes for 6.10-rc3
Just a few small fixes. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEKnAFLkS8Qha+jvQrE6szbY3KbnYFAmZgfSQACgkQE6szbY3K bnaNwg/+ItbzvZqECfZqmSnPbcOXMKnuyAqnARRTn4GiAH3sJ8PEZPyPqeEyKGt+ xWRG9ROIiwyVkNA3k/AuORKcwdzkEZyASQX8wPnHZdUXaGDmeRte/bhSgiqZJOi6 0i98eISFGIjyVcAdYQoFN/eGO+k4ATgU5P0Kn1YfXwgGUbwHbXyPCHcm44G6wLP7 FXsHEVBlexvPDVTle2i9LIwP9oNLBwycQalyg83zyNnSHe3zhP8ddUSCBGJZVxum hyXfUch6KjkDKFiFvL/kRpZUgsG0d5/ouoBV8LDfz7iFDEBnsscAeUcUvL00gKzN A4rErDL80tarbx0D5Wdp5JsxDWyuklwbXc6bIY3rhhIFn/JZgyqQWGqpdwQy+T4B 4qeyDCLcITiosMT5K9fSPLc+DwkOqSOwASitmAQuHPDRzXk466bjJmUZBy3fvJv0 w9px2adgP+3/wlYJMEIcQx3vh/m2t3QDs8Ut3xZm10g6Fu0x92/QiOVGB6yxQHlg txYRTpLvb5DZ9dZUlyYmA8d7HG4828DrFNdmtkFx+1STPpH1ZYkoN6IYwQQAl+kQ po63h55xS8CLUrTplcwBAiS+fDWMO2hZ1TTXjAGeNF19A1PygFQARGROcHGYi9Jp 5L2xdYWDdf9YYBxMDyDgXkRGtYEv8b7sJTHEGb7SQaaUMHU7Mo4= =ODoL -----END PGP SIGNATURE----- Merge tag 'bcachefs-2024-06-05' of https://evilpiepirate.org/git/bcachefs Pull bcachefs fixes from Kent Overstreet: "Just a few small fixes" * tag 'bcachefs-2024-06-05' of https://evilpiepirate.org/git/bcachefs: bcachefs: Fix trans->locked assert bcachefs: Rereplicate now moves data off of durability=0 devices bcachefs: Fix GFP_KERNEL allocation in break_cycle()
This commit is contained in:
commit
e20b269d73
|
@ -215,6 +215,7 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle)
|
||||||
|
|
||||||
if (unlikely(!best)) {
|
if (unlikely(!best)) {
|
||||||
struct printbuf buf = PRINTBUF;
|
struct printbuf buf = PRINTBUF;
|
||||||
|
buf.atomic++;
|
||||||
|
|
||||||
prt_printf(&buf, bch2_fmt(g->g->trans->c, "cycle of nofail locks"));
|
prt_printf(&buf, bch2_fmt(g->g->trans->c, "cycle of nofail locks"));
|
||||||
|
|
||||||
|
|
|
@ -547,6 +547,7 @@ static int bch2_move_data_btree(struct moving_context *ctxt,
|
||||||
ctxt->stats->pos = BBPOS(btree_id, start);
|
ctxt->stats->pos = BBPOS(btree_id, start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bch2_trans_begin(trans);
|
||||||
bch2_trans_iter_init(trans, &iter, btree_id, start,
|
bch2_trans_iter_init(trans, &iter, btree_id, start,
|
||||||
BTREE_ITER_prefetch|
|
BTREE_ITER_prefetch|
|
||||||
BTREE_ITER_all_snapshots);
|
BTREE_ITER_all_snapshots);
|
||||||
|
@ -920,7 +921,20 @@ static bool rereplicate_pred(struct bch_fs *c, void *arg,
|
||||||
? c->opts.metadata_replicas
|
? c->opts.metadata_replicas
|
||||||
: io_opts->data_replicas;
|
: io_opts->data_replicas;
|
||||||
|
|
||||||
if (!nr_good || nr_good >= replicas)
|
rcu_read_lock();
|
||||||
|
struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
|
||||||
|
unsigned i = 0;
|
||||||
|
bkey_for_each_ptr(ptrs, ptr) {
|
||||||
|
struct bch_dev *ca = bch2_dev_rcu(c, ptr->dev);
|
||||||
|
if (!ptr->cached &&
|
||||||
|
(!ca || !ca->mi.durability))
|
||||||
|
data_opts->kill_ptrs |= BIT(i);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
rcu_read_unlock();
|
||||||
|
|
||||||
|
if (!data_opts->kill_ptrs &&
|
||||||
|
(!nr_good || nr_good >= replicas))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
data_opts->target = 0;
|
data_opts->target = 0;
|
||||||
|
|
Loading…
Reference in a new issue