Update bcachefs sources to 5be664992e21 bcachefs: Fix build error with clang

This commit is contained in:
Kent Overstreet 2025-10-04 01:11:02 -04:00
parent 14bccc22f6
commit e919b852b4
2 changed files with 17 additions and 15 deletions

View File

@ -1 +1 @@
100a4d92ca71a2bce5d68f2c6916b1c23607a429 5be664992e214b32a77f85c74b43bf83f02c9aae

View File

@ -1485,21 +1485,23 @@ err:
} }
return; return;
err_bucket_stale: err_bucket_stale:
CLASS(printbuf, buf)(); {
if (bch2_fs_inconsistent_on(stale < 0, c, CLASS(printbuf, buf)();
"pointer to invalid bucket in nocow path on device %u\n %s", if (bch2_fs_inconsistent_on(stale < 0, c,
stale_at->dev, "pointer to invalid bucket in nocow path on device %u\n %s",
(bch2_bkey_val_to_text(&buf, c, k), buf.buf))) { stale_at->dev,
ret = bch_err_throw(c, data_write_invalid_ptr); (bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
} else { ret = bch_err_throw(c, data_write_invalid_ptr);
/* We can retry this: */ } else {
ret = bch_err_throw(c, transaction_restart); /* We can retry this: */
} ret = bch_err_throw(c, transaction_restart);
}
bch2_bkey_nocow_unlock(c, k, BUCKET_NOCOW_LOCK_UPDATE); bch2_bkey_nocow_unlock(c, k, BUCKET_NOCOW_LOCK_UPDATE);
bkey_for_each_ptr(ptrs, ptr) bkey_for_each_ptr(ptrs, ptr)
enumerated_ref_put(&bch2_dev_have_ref(c, ptr->dev)->io_ref[WRITE], enumerated_ref_put(&bch2_dev_have_ref(c, ptr->dev)->io_ref[WRITE],
BCH_DEV_WRITE_REF_io_write); BCH_DEV_WRITE_REF_io_write);
}
/* Fall back to COW path: */ /* Fall back to COW path: */
goto out; goto out;