From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 7 Oct 2020 19:39:04 +0000 (-0700)
Subject: Merge PR #37497 into master
X-Git-Tag: v16.1.0~898
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=998149bef5502eaacf389436ce0c583b7cbf22c4;p=ceph.git

Merge PR #37497 into master

* refs/pull/37497/head:
	client,mds: Drop execute permission bits

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

998149bef5502eaacf389436ce0c583b7cbf22c4
diff --cc src/client/Client.cc
index 7fcc41933c33,145a1c02e290..7fcc41933c33
mode 100755,100644..100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
diff --cc src/mds/CDir.cc
index d53d59dc6e6d,7061de14442e..d53d59dc6e6d
mode 100755,100644..100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc