]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OpTracker: clarify that unregister_inflight_op is only called if enabled
authorSamuel Just <sam.just@inktank.com>
Sat, 1 Mar 2014 21:54:53 +0000 (13:54 -0800)
committerSamuel Just <sam.just@inktank.com>
Sat, 1 Mar 2014 22:54:06 +0000 (14:54 -0800)
The !tracking_enabled branch actually had a leak which was unreachable
since the caller does the check for tracking_enabled.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/common/TrackedOp.cc

index a1abf9ff1025b2b3e0e12c4fa2d99e4401669d72..9e83c0b74b6c8bf29d1629f8253dc311f71935c5 100644 (file)
@@ -118,10 +118,10 @@ void OpTracker::register_inflight_op(xlist<TrackedOp*>::item *i)
 
 void OpTracker::unregister_inflight_op(TrackedOp *i)
 {
+  // caller checks;
+  assert(tracking_enabled);
   i->request->clear_data();
 
-  if (!tracking_enabled)
-    return;
 
   Mutex::Locker locker(ops_in_flight_lock);
   assert(i->xitem.get_list() == &ops_in_flight);