From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 15 Dec 2021 15:00:29 +0000 (-0500)
Subject: mds: skip directory size checks for reintegration
X-Git-Tag: v15.2.17~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44668%2Fhead;p=ceph.git

mds: skip directory size checks for reintegration

Directory size will not change.

Fixes: https://tracker.ceph.com/issues/53619
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit cdc7e67abcdedf33523e876431ad1abb2492a74d)

Conflicts:
	src/mds/Server.cc
	  - skip the checks of `check_dir_max_entries`
	    because check_dir_max_entries does not
	    introduce to octopus
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 410004316403..d867b63ae668 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -7950,7 +7950,7 @@ void Server::handle_client_rename(MDRequestRef& mdr)
     if (!check_access(mdr, destdn->get_dir()->get_inode(), MAY_WRITE))
       return;
 
-    if (!check_fragment_space(mdr, destdn->get_dir()))
+    if (!linkmerge && !check_fragment_space(mdr, destdn->get_dir()))
       return;
 
     if (!check_access(mdr, srci, MAY_WRITE))