From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 13 Jul 2020 18:14:16 +0000 (-0700)
Subject: Merge PR #35690 into master
X-Git-Tag: v16.1.0~1748
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b9008abc3a7fc0f72cb26053f6b5df9731bd1d7;p=ceph.git

Merge PR #35690 into master

* refs/pull/35690/head:
	mds: fix hang issue when accessing a file under a lost parent directory

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

6b9008abc3a7fc0f72cb26053f6b5df9731bd1d7
diff --cc src/mds/CDir.cc
index d46a97c6c388,c2393dfa15fe..548a8c8a2caf
mode 100755,100644..100755
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc