From: Kefu Chai <kchai@redhat.com>
Date: Mon, 4 Jan 2021 14:54:10 +0000 (+0800)
Subject: Merge pull request #38663 from tchaikov/wip-crimson-recovery-cleanups
X-Git-Tag: v16.1.0~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d39c1794a54f794bd7569decf372d98a68c92b6a;p=ceph.git

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>
---

d39c1794a54f794bd7569decf372d98a68c92b6a
diff --cc src/crimson/osd/pg_backend.h
index 303a24022f7,6ea0ef81b33..d8fa8b2ac83
--- a/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(