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 f6b6c7f9ffb3df09e5ac459a210b112a02e0374d..28a1b1a240e9c85a9dbd243ad205ab017528dc4a 100644 (file)
--- 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);
        }