33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
--- ceph-18.0.0-1810-g728e8ac0/src/osd/scrubber/scrub_backend.h.orig 2023-01-18 16:35:03.398700052 -0500
|
||
|
|
+++ ceph-18.0.0-1810-g728e8ac0/src/osd/scrubber/scrub_backend.h 2023-01-18 16:37:55.882677965 -0500
|
||
|
|
@@ -183,20 +183,20 @@
|
||
|
|
// note: 'if' chain, as hard to consistently (on all compilers) avoid some
|
||
|
|
// warnings for a switch plus multiple return paths
|
||
|
|
if (as_auth.possible_auth == shard_as_auth_t::usable_t::not_usable) {
|
||
|
|
- return format_to(ctx.out(),
|
||
|
|
- "{{shard-not-usable:{}}}",
|
||
|
|
- as_auth.error_text);
|
||
|
|
+ return fmt::format_to(ctx.out(),
|
||
|
|
+ "{{shard-not-usable:{}}}",
|
||
|
|
+ as_auth.error_text.c_str());
|
||
|
|
}
|
||
|
|
if (as_auth.possible_auth == shard_as_auth_t::usable_t::not_found) {
|
||
|
|
- return format_to(ctx.out(), "{{shard-not-found}}");
|
||
|
|
+ return fmt::format_to(ctx.out(), "{{shard-not-found}}");
|
||
|
|
}
|
||
|
|
- return format_to(ctx.out(),
|
||
|
|
- "{{shard-usable: soid:{} {{txt:{}}} }}",
|
||
|
|
- as_auth.oi.soid,
|
||
|
|
- as_auth.error_text);
|
||
|
|
+ return fmt::format_to(ctx.out(),
|
||
|
|
+ "{{shard-usable: soid:{} {{txt:{}}} }}",
|
||
|
|
+ as_auth.oi.soid,
|
||
|
|
+ as_auth.error_text.c_str());
|
||
|
|
|
||
|
|
} else {
|
||
|
|
- return format_to(
|
||
|
|
+ return fmt::format_to(
|
||
|
|
ctx.out(),
|
||
|
|
"usable:{} soid:{} {{txt:{}}}",
|
||
|
|
(as_auth.possible_auth == shard_as_auth_t::usable_t::usable) ? "yes"
|