]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove duplicate checks 5032/head
authorGuang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
Sat, 20 Jun 2015 00:15:38 +0000 (00:15 +0000)
committerGuang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
Sat, 20 Jun 2015 00:17:24 +0000 (00:17 +0000)
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>
src/osd/PG.cc

index 52b67a9a6cc84ff3f91ef54e141a1073d10b459d..b8499ba396cade88051a01b7a1b40bb245b9ea1a 100644 (file)
@@ -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);