From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 10 Nov 2015 12:09:38 +0000 (+0800)
Subject: mds: properly call CDir::scrub_finished()
X-Git-Tag: v10.0.1~51^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50c088b044803ebab55cf67f0d4057b065c57475;p=ceph.git

mds: properly call CDir::scrub_finished()

call CDir::scrub_finished() after finishing scrub a dirfrag

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 1eb5e93c261e..2615dfc47374 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -350,14 +350,14 @@ void ScrubStack::scrub_dirfrag(CDir *dir, bool *added_children,
       if (scrubbing.empty()) {
         dout(20) << __func__ << " dirfrag done: " << *dir << dendl;
         // FIXME: greg: What's the diff meant to be between done and terminal
+	dir->scrub_finished();
         *done = true;
         *is_terminal = true;
-        continue;
       } else {
         dout(20) << __func__ << " " << scrubbing.size() << " dentries still "
                    "scrubbing in " << *dir << dendl;
-        return;
       }
+      return;
     }
 
     if (r < 0) {