Merge pull request #38663 from tchaikov/wip-crimson-recovery-cleanups

crimson/osd: fixes and cleanups

Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --cc src/crimson/osd/pg_backend.cc
Simple merge

diff --cc src/crimson/osd/pg_backend.h
index 303a24022f70e878bd59931f5cf70cb057cfd14a,6ea0ef81b33c085c0fad61ee0ec00ed10e1d3242..d8fa8b2ac836e36172fbb612a579e3f55a4f7238
--- 1/src/crimson/osd/pg_backend.h
--- 2/src/crimson/osd/pg_backend.h
+++ b/src/crimson/osd/pg_backend.h
@@@ -170,13 -170,13 +170,13 @@@ public
      OSDOp& osd_op) const;
    seastar::future<> omap_set_vals(
      ObjectState& os,
 -    OSDOp& osd_op,
 +    const OSDOp& osd_op,
      ceph::os::Transaction& trans,
      osd_op_params_t& osd_op_params);
-   seastar::future<ceph::bufferlist> omap_get_header(
+   ll_read_errorator::future<ceph::bufferlist> omap_get_header(
      const crimson::os::CollectionRef& c,
      const ghobject_t& oid) const;
-   seastar::future<> omap_get_header(
+   ll_read_errorator::future<> omap_get_header(
      const ObjectState& os,
      OSDOp& osd_op) const;
    seastar::future<> omap_set_header(