From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 16 Dec 2015 08:31:09 +0000 (+0800)
Subject: mds: don't ignore scrubbing non-regular non-directory inodes
X-Git-Tag: v10.1.0~176^2~1^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f13fb47902e958f6c44af60dc98f331135221bbc;p=ceph.git

mds: don't ignore scrubbing non-regular non-directory inodes

The overhead of scrubbing them is low, so don't treat them specially.

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

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 158d6735d1fb..df55b8fa2acd 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -99,21 +99,12 @@ void ScrubStack::kick_off_scrubs()
       // it's a regular file, symlink, or hard link
       pop_dentry(cur); // we only touch it this once, so remove from stack
 
-      if (curi->is_file()) {
-	if (!cur->scrub_info()->on_finish) {
-	  scrubs_in_progress++;
-	  cur->scrub_set_finisher(&scrub_kick);
-	}
-        scrub_file_dentry(cur);
-        can_continue = true;
-      } else {
-        // drat, we don't do anything with these yet :(
-        dout(5) << "skipping scrub on non-dir, non-file dentry "
-                << *cur << dendl;
-	Context *c = NULL;
-	cur->scrub_finished(&c);
-	assert(c == NULL);
+      if (!cur->scrub_info()->on_finish) {
+	scrubs_in_progress++;
+	cur->scrub_set_finisher(&scrub_kick);
       }
+      scrub_file_dentry(cur);
+      can_continue = true;
     } else {
       bool completed; // it's done, so pop it off the stack
       bool terminal; // not done, but we can start ops on other directories