From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Mon, 6 Jul 2015 02:48:36 +0000 (+0800)
Subject: common/TrackedOp: clean up code make look good.
X-Git-Tag: v0.94.10~11^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f37a397e35f105b5ea57c7a1a0463c95a2384e1;p=ceph.git

common/TrackedOp: clean up code make look good.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit edefd05edce6728774bb396ea4e6641ea53463cd)
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 32dbc5398dc..1875648fe48 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -155,9 +155,8 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
   utime_t now = ceph_clock_now(cct);
   utime_t too_old = now;
   too_old -= complaint_time;
-  utime_t oldest_op;
+  utime_t oldest_op = now;
   uint64_t total_ops_in_flight = 0;
-  bool got_first_op = false;
 
   for (uint32_t i = 0; i < num_optracker_shards; i++) {
     ShardedTrackingData* sdata = sharded_in_flight_list[i];
@@ -165,10 +164,7 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
     Mutex::Locker locker(sdata->ops_in_flight_lock_sharded);
     if (!sdata->ops_in_flight_sharded.empty()) {
       utime_t oldest_op_tmp = sdata->ops_in_flight_sharded.front()->get_initiated();
-      if (!got_first_op) {
-        oldest_op = oldest_op_tmp;
-        got_first_op = true;
-      } else if (oldest_op_tmp < oldest_op) {
+      if (oldest_op_tmp < oldest_op) {
         oldest_op = oldest_op_tmp;
       }
     }