Merge pull request #11613 from stiopaa1/mds_cdir_removeUnneededUseofC…

…ount mds/CDir.cc: remove unneeded use of count Reviewed-by: Greg Farnum <gfarnum@redhat.com>
ceph · Oct 25, 2016 · 32838f7 · 32838f7
2 parents 4f1c042 + 7a90d18
commit 32838f7
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
@@ -3072,8 +3072,7 @@ void CDir::scrub_dentry_finished(CDentry *dn)
   dout(20) << __func__ << " on dn " << *dn << dendl;
   assert(scrub_infop && scrub_infop->directory_scrubbing);
   dentry_key_t dn_key = dn->key();
-  if (scrub_infop->directories_scrubbing.count(dn_key)) {
-    scrub_infop->directories_scrubbing.erase(dn_key);
+  if (scrub_infop->directories_scrubbing.erase(dn_key)) {
     scrub_infop->directories_scrubbed.insert(dn_key);
   } else {
     assert(scrub_infop->others_scrubbing.count(dn_key));