]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: get SnapSetContext from head_obc
authorZhang Song <zhangsong02@qianxin.com>
Wed, 17 Jan 2024 03:39:53 +0000 (11:39 +0800)
committerZhang Song <zhangsong02@qianxin.com>
Wed, 17 Jan 2024 03:40:30 +0000 (11:40 +0800)
Signed-off-by: Zhang Song <zhangsong02@qianxin.com>
src/crimson/osd/pg_backend.cc

index 8c68301530b46027bb814d243183da2b7b92ee77..a3a777f848ad21c9f13c19333a5b06359c1e4854 100644 (file)
@@ -808,7 +808,7 @@ PGBackend::rollback_iertr::future<> PGBackend::rollback(
   return obc_loader.with_clone_obc_only<RWState::RWWRITE>(
     head, target_coid,
     [this, &os, &txn, &delta_stats, &osd_op_params, &snapid]
-    (auto, auto resolved_obc) {
+    (auto head_obc, auto resolved_obc) {
     if (resolved_obc->obs.oi.soid.is_head()) {
       // no-op: The resolved oid returned the head object
       logger().debug("PGBackend::rollback: loaded head_obc: {}"
@@ -846,7 +846,7 @@ PGBackend::rollback_iertr::future<> PGBackend::rollback(
 
     // 3) Calculate clone_overlaps by following overlaps
     const auto& clone_overlap =
-      resolved_obc->ssc->snapset.clone_overlap;
+      head_obc->ssc->snapset.clone_overlap;
     auto iter = clone_overlap.lower_bound(snapid);
     ceph_assert(iter != clone_overlap.end());
     interval_set<uint64_t> overlaps = iter->second;