From: David Zafman <david.zafman@inktank.com>
Date: Wed, 31 Jul 2013 18:08:34 +0000 (-0700)
Subject: osdc: op left in check_lastest_map_ops
X-Git-Tag: v0.67~37^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=600e6aca2c08a1b7b60dbdb9595a28fdfbf8ecb6;p=ceph.git

osdc: op left in check_lastest_map_ops

Call op_cancel_map_check before cancel_op() in send_linger()

Fixes: #5784

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 3632ae1c24c3..ab4954ee216b 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -295,6 +295,7 @@ void Objecter::send_linger(LingerOp *info)
     // repeat send.  cancel old registeration op, if any.
     if (ops.count(info->register_tid)) {
       Op *o = ops[info->register_tid];
+      op_cancel_map_check(o);
       cancel_op(o);
     }
     info->register_tid = _op_submit(o);