From 8f76f4c467dc69cd2af75d9cbb134c26f2d04a84 Mon Sep 17 00:00:00 2001
From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 1 Sep 2015 15:39:29 +0800
Subject: [PATCH] osdc/Objecter: Don't forget call _op_cancel_map_check when
 cancel linger op.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 7cc963b1c6ab37bf33638dc6eca7848d93f7908f)
---
 src/osdc/Objecter.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d318d18e7958d..351a50a176370 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1126,6 +1126,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
 	_send_op(op);
       }
     } else {
+      _op_cancel_map_check(op);
       _cancel_linger_op(op);
     }
     s->lock.unlock();
@@ -1780,6 +1781,7 @@ void Objecter::_kick_requests(OSDSession *session, map<uint64_t, LingerOp *>& lr
       if (!op->target.paused)
 	resend[op->tid] = op;
     } else {
+      _op_cancel_map_check(op);
       _cancel_linger_op(op);
     }
   }
-- 
2.39.5