From: Guang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
Date: Sat, 20 Jun 2015 00:15:38 +0000 (+0000)
Subject: osd: remove duplicate checks
X-Git-Tag: v9.0.3~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5032%2Fhead;p=ceph.git

osd: remove duplicate checks

Within pg_has_reset_since, it checkes if the PG is being deleted or not,
no need a duplicate check

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 52b67a9a6cc8..b8499ba396ca 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3834,7 +3834,7 @@ void PG::scrub(epoch_t queued, ThreadPool::TPHandle &handle)
     lock();
     dout(20) << __func__ << " slept for " << t << dendl;
   }
-  if (deleting || pg_has_reset_since(queued)) {
+  if (pg_has_reset_since(queued)) {
     return;
   }
   assert(scrub_queued);