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: depends on #44512

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 618f1160de56982b888810482c6c89104851e82d..0e4e821177258854aa61ffc7d4d644a91a0164c2 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -8189,7 +8189,10 @@ 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 (!linkmerge && !check_dir_max_entries(mdr, destdn->get_dir()))
       return;
 
     if (!check_access(mdr, srci, MAY_WRITE))