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: v17.1.0~183^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdc7e67abcdedf33523e876431ad1abb2492a74d;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>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 1ed15937013c..0298f3fcc68b 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -8240,10 +8240,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 (!check_dir_max_entries(mdr, destdn->get_dir()))
+    if (!linkmerge && !check_dir_max_entries(mdr, destdn->get_dir()))
       return;
 
     if (!check_access(mdr, srci, MAY_WRITE))