From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 22 Feb 2016 07:21:27 +0000 (+0800)
Subject: mds: set ScrubHeader for dirfrag when doing non-recursive scrub
X-Git-Tag: v10.1.0~176^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2da944961374be1a6fe624ba844c8cbce0d35522;p=ceph.git

mds: set ScrubHeader for dirfrag when doing non-recursive scrub

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

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index f6b6c7f9ffb3..28a1b1a240e9 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3895,10 +3895,12 @@ next:
           p != frags.end();
           ++p) {
         CDir *dir = in->get_or_open_dirfrag(in->mdcache, *p);
+	dir->scrub_info();
+	if (!dir->scrub_infop->header && in->scrub_infop)
+	  dir->scrub_infop->header = in->scrub_infop->header;
         if (dir->is_complete()) {
 	  dir->scrub_local();
 	} else {
-	  dir->scrub_info();
 	  dir->scrub_infop->need_scrub_local = true;
 	  dir->fetch(gather.new_sub(), false);
 	}