From: Samuel Just <sjust@redhat.com>
Date: Fri, 20 May 2016 20:59:10 +0000 (-0700)
Subject: ReplicatedPG: adjust num_pinned in _delete_oid
X-Git-Tag: v0.94.8~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9496%2Fhead;p=ceph.git

ReplicatedPG: adjust num_pinned in _delete_oid

Fixes: http://tracker.ceph.com/issues/15952
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 907d4e25c676fd3e1c2be90ce8ab5b64b362b0bc)
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index e846938610ab..352918c20d88 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5230,6 +5230,9 @@ inline int ReplicatedPG::_delete_oid(OpContext *ctx, bool no_whiteout)
     dout(20) << __func__ << " deleting whiteout on " << soid << dendl;
     ctx->delta_stats.num_whiteouts--;
   }
+  if (oi.is_cache_pinned()) {
+    ctx->delta_stats.num_objects_pinned--;
+  }
   if (soid.is_head())
     snapset.head_exists = false;
   obs.exists = false;