From: Lei Dong <leidong@yahoo-inc.com>
Date: Tue, 30 Dec 2014 13:02:45 +0000 (+0800)
Subject: clear data and payload inside ops_in_flight_lock
X-Git-Tag: v0.80.8~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96ba529ef8ce76e07b8444c94883afb3468d6762;p=ceph.git

clear data and payload inside ops_in_flight_lock

http://tracker.ceph.com/issues/9916 Fixes: #9916
Signed-off-by: Dong Lei <leidong@yahoo-inc.com>
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index ddb2f91ac3f..5a76f6472e3 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -121,10 +121,10 @@ void OpTracker::unregister_inflight_op(TrackedOp *i)
   // caller checks;
   assert(tracking_enabled);
 
+  Mutex::Locker locker(ops_in_flight_lock);
   i->request->clear_data();
   i->request->clear_payload();
 
-  Mutex::Locker locker(ops_in_flight_lock);
   assert(i->xitem.get_list() == &ops_in_flight);
   utime_t now = ceph_clock_now(cct);
   i->xitem.remove_myself();