niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

bcachefs: More stripe create cleanup/fixes

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-03-03 03:11:06 -05:00
parent a1fb08f5df
commit 9d32097f3b
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/bcachefs/btree_gc.c
View file

@ -1702,11 +1702,12 @@ static int bch2_gc_write_stripes_key(struct btree_trans *trans,
return 0; return 0;
inconsistent: inconsistent:
if (fsck_err_on(true, c, if (fsck_err_on(true, c,
"stripe has wrong block sector count %u:\n" "stripe block %u has wrong sector count:\n"
" %s\n" " %s\n"
" should be %u", i, " got %u, should be %u", i,
(printbuf_reset(&buf), (printbuf_reset(&buf),
bch2_bkey_val_to_text(&buf, c, k), buf.buf), bch2_bkey_val_to_text(&buf, c, k), buf.buf),
stripe_blockcount_get(s, i),
m ? m->block_sectors[i] : 0)) { m ? m->block_sectors[i] : 0)) {
struct bkey_i_stripe *new; struct bkey_i_stripe *new;

32
fs/bcachefs/ec.c
View file

@ -866,8 +866,16 @@ static int ec_stripe_key_update(struct btree_trans *trans,
goto err; goto err;
} }
for (i = 0; i < new->v.nr_blocks; i++) for (i = 0; i < new->v.nr_blocks; i++) {
stripe_blockcount_set(&new->v, i, stripe_blockcount_get(old, i)); unsigned v = stripe_blockcount_get(old, i);
BUG_ON(v &&
(old->ptrs[i].dev != new->v.ptrs[i].dev ||
old->ptrs[i].gen != new->v.ptrs[i].gen ||
old->ptrs[i].offset != new->v.ptrs[i].offset));
stripe_blockcount_set(&new->v, i, v);
}
} }
ret = bch2_trans_update(trans, &iter, &new->k_i, 0); ret = bch2_trans_update(trans, &iter, &new->k_i, 0);
@ -1542,10 +1550,11 @@ static int __bch2_ec_stripe_head_reuse(struct btree_trans *trans, struct ec_stri
if (idx < 0) if (idx < 0)
return -BCH_ERR_ENOSPC_stripe_reuse; return -BCH_ERR_ENOSPC_stripe_reuse;
h->s->have_existing_stripe = true;
ret = get_stripe_key_trans(trans, idx, &h->s->existing_stripe); ret = get_stripe_key_trans(trans, idx, &h->s->existing_stripe);
if (ret) { if (ret) {
bch2_fs_fatal_error(c, "error reading stripe key: %i", ret); bch2_stripe_close(c, h->s);
if (!bch2_err_matches(ret, BCH_ERR_transaction_restart))
bch2_fs_fatal_error(c, "error reading stripe key: %s", bch2_err_str(ret));
return ret; return ret;
} }
@ -1569,8 +1578,8 @@ static int __bch2_ec_stripe_head_reuse(struct btree_trans *trans, struct ec_stri
ec_block_io(c, &h->s->existing_stripe, READ, i, &h->s->iodone); ec_block_io(c, &h->s->existing_stripe, READ, i, &h->s->iodone);
} }
bkey_copy(&h->s->new_stripe.key.k_i, bkey_copy(&h->s->new_stripe.key.k_i, &h->s->existing_stripe.key.k_i);
&h->s->existing_stripe.key.k_i); h->s->have_existing_stripe = true;
return 0; return 0;
} }
@ -1584,13 +1593,14 @@ static int __bch2_ec_stripe_head_reserve(struct btree_trans *trans, struct ec_st
struct bpos start_pos = bpos_max(min_pos, POS(0, c->ec_stripe_hint)); struct bpos start_pos = bpos_max(min_pos, POS(0, c->ec_stripe_hint));
int ret; int ret;
BUG_ON(h->s->res.sectors); if (!h->s->res.sectors) {
ret = bch2_disk_reservation_get(c, &h->s->res, ret = bch2_disk_reservation_get(c, &h->s->res,
h->blocksize, h->blocksize,
h->s->nr_parity, 0); h->s->nr_parity,
BCH_DISK_RESERVATION_NOFAIL);
if (ret) if (ret)
return ret; return ret;
}
for_each_btree_key_norestart(trans, iter, BTREE_ID_stripes, start_pos, for_each_btree_key_norestart(trans, iter, BTREE_ID_stripes, start_pos,
BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) { BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {
@ -1673,10 +1683,8 @@ struct ec_stripe_head *bch2_ec_stripe_head_get(struct btree_trans *trans,
if (ret && needs_stripe_new) if (ret && needs_stripe_new)
ret = __bch2_ec_stripe_head_reuse(trans, h); ret = __bch2_ec_stripe_head_reuse(trans, h);
if (ret) { if (ret)
bch_err_ratelimited(c, "failed to get stripe: %s", bch2_err_str(ret));
goto err; goto err;
}
if (!h->s->allocated) { if (!h->s->allocated) {
ret = new_stripe_alloc_buckets(trans, h, reserve, cl); ret = new_stripe_alloc_buckets(trans, h, reserve, cl);