From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 5 Oct 2020 23:32:48 +0000 (-0700)
Subject: Merge pull request #37034 from smithfarm/wip-46520-octopus
X-Git-Tag: v15.2.8~12^2~1^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=252f5bdf4bc8b2da6b51bac09e810d6dbf8734ba;p=ceph.git

Merge pull request #37034 from smithfarm/wip-46520-octopus

octopus: mds: do not submit omap_rm_keys if the dir is the basedir of merge

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

252f5bdf4bc8b2da6b51bac09e810d6dbf8734ba
diff --cc src/mds/CDir.cc
index 7d20acc30cf31,62234fb3814c0..f145bc1d112e7
mode 100644,100755..100755
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc