From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Sep 2017 16:09:06 +0000 (-0400)
Subject: osd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc
X-Git-Tag: v13.0.1~840^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d45f262438f3c908f6d0f9d3e291553ee458d1b;p=ceph.git

osd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 3cb77cb1377..1dae1b3f445 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -3780,14 +3780,14 @@ int PrimaryLogPG::trim_object(
 	pg_log_entry_t::DELETE,
 	head_oid,
 	ctx->at_version,
-	ctx->snapset_obc->obs.oi.version,
+	head_obc->obs.oi.version,
 	0,
 	osd_reqid_t(),
 	ctx->mtime,
 	0)
       );
     derr << "removing snap head" << dendl;
-    object_info_t& oi = ctx->snapset_obc->obs.oi;
+    object_info_t& oi = head_obc->obs.oi;
     ctx->delta_stats.num_objects--;
     if (oi.is_dirty()) {
       ctx->delta_stats.num_objects_dirty--;
@@ -3801,8 +3801,8 @@ int PrimaryLogPG::trim_object(
     if (oi.is_cache_pinned()) {
       ctx->delta_stats.num_objects_pinned--;
     }
-    ctx->snapset_obc->obs.exists = false;
-    ctx->snapset_obc->obs.oi = object_info_t(head_oid);
+    head_obc->obs.exists = false;
+    head_obc->obs.oi = object_info_t(head_oid);
     t->remove(head_oid);
   } else {
     dout(10) << coid << " filtering snapset on " << head_oid << dendl;
@@ -3814,16 +3814,15 @@ int PrimaryLogPG::trim_object(
 	pg_log_entry_t::MODIFY,
 	head_oid,
 	ctx->at_version,
-	ctx->snapset_obc->obs.oi.version,
+	head_obc->obs.oi.version,
 	0,
 	osd_reqid_t(),
 	ctx->mtime,
 	0)
       );
 
-    ctx->snapset_obc->obs.oi.prior_version =
-      ctx->snapset_obc->obs.oi.version;
-    ctx->snapset_obc->obs.oi.version = ctx->at_version;
+    head_obc->obs.oi.prior_version = head_obc->obs.oi.version;
+    head_obc->obs.oi.version = ctx->at_version;
 
     map <string, bufferlist> attrs;
     bl.clear();
@@ -3831,7 +3830,7 @@ int PrimaryLogPG::trim_object(
     attrs[SS_ATTR].claim(bl);
 
     bl.clear();
-    ::encode(ctx->snapset_obc->obs.oi, bl,
+    ::encode(head_obc->obs.oi, bl,
 	     get_osdmap()->get_features(CEPH_ENTITY_TYPE_OSD, nullptr));
     attrs[OI_ATTR].claim(bl);
     t->setattrs(head_oid, attrs);