From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 1 Sep 2015 07:12:02 +0000 (+0800)
Subject: osdc/Objecter: In _cancel_linger_op, it should make num_unacked/num_committed decrease.
X-Git-Tag: v9.1.0~145^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36b62710ddef0ffaee25837a92ca1ac9b353ff05;p=ceph.git

osdc/Objecter: In _cancel_linger_op, it should make num_unacked/num_committed decrease.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index b6be13d3038f..ebcade71ba45 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2771,9 +2771,15 @@ void Objecter::_cancel_linger_op(Op *op)
   ldout(cct, 15) << "cancel_op " << op->tid << dendl;
 
   assert(!op->should_resend);
-  delete op->onack;
-  delete op->oncommit;
-  delete op->oncommit_sync;
+  if (op->onack) {
+    delete op->onack;
+    num_unacked.dec();
+  }
+  if (op->oncommit || op->oncommit_sync) {
+    delete op->oncommit;
+    delete op->oncommit_sync;
+    num_uncommitted.dec();
+  }
 
   _finish_op(op);
 }