]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: properly call CDir::scrub_finished()
authorYan, Zheng <zyan@redhat.com>
Tue, 10 Nov 2015 12:09:38 +0000 (20:09 +0800)
committerYan, Zheng <zyan@redhat.com>
Tue, 10 Nov 2015 14:21:23 +0000 (22:21 +0800)
call CDir::scrub_finished() after finishing scrub a dirfrag

Signed-off-by: Yan, Zheng <zyan@redhat.com>
src/mds/ScrubStack.cc

index 1eb5e93c261ef1bedfa53ed478428bd1f50d224d..2615dfc47374dcd45ff8280221e848699b238a10 100644 (file)
@@ -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) {