From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 24 Dec 2020 04:35:39 +0000 (-0800)
Subject: Merge PR #37428 into master
X-Git-Tag: v16.1.0~176
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e59b6825a70a22f08c16a04dc1e16bb4393788a;p=ceph.git

Merge PR #37428 into master

* refs/pull/37428/head:
	mds: move duplicated inner loop out
	mds: try to replicate hot dir to restarted MDS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
---

6e59b6825a70a22f08c16a04dc1e16bb4393788a
diff --cc src/mds/CDir.cc
index b78cd0096505,fb55170e8e0d..1da9103158fb
mode 100644,100755..100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc