From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Aug 2017 22:23:53 +0000 (-0400)
Subject: osd/PrimaryLogPG: add_object_context_to_pg_stat: drop snapdir handling
X-Git-Tag: v13.0.1~840^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5eb3ba195ba684bb29a4d69cb503c039a20b94a4;p=ceph.git

osd/PrimaryLogPG: add_object_context_to_pg_stat: drop snapdir handling

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index c14e518c4e82..5a16ee039c23 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -9937,12 +9937,11 @@ void PrimaryLogPG::add_object_context_to_pg_stat(ObjectContextRef obc, pg_stat_t
   object_info_t& oi = obc->obs.oi;
 
   dout(10) << "add_object_context_to_pg_stat " << oi.soid << dendl;
-  object_stat_sum_t stat;
+  assert(!oi.soid.is_snapdir());
 
+  object_stat_sum_t stat;
   stat.num_bytes += oi.size;
-
-  if (oi.soid.snap != CEPH_SNAPDIR)
-    stat.num_objects++;
+  stat.num_objects++;
   if (oi.is_dirty())
     stat.num_objects_dirty++;
   if (oi.is_whiteout())
@@ -9952,7 +9951,7 @@ void PrimaryLogPG::add_object_context_to_pg_stat(ObjectContextRef obc, pg_stat_t
   if (oi.is_cache_pinned())
     stat.num_objects_pinned++;
 
-  if (oi.soid.snap && oi.soid.snap != CEPH_NOSNAP && oi.soid.snap != CEPH_SNAPDIR) {
+  if (oi.soid.is_snap()) {
     stat.num_object_clones++;
 
     if (!obc->ssc)