]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: skip directory size checks for reintegration 44322/head
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Dec 2021 15:00:29 +0000 (10:00 -0500)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Dec 2021 16:05:36 +0000 (11:05 -0500)
Directory size will not change.

Fixes: https://tracker.ceph.com/issues/53619
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Server.cc

index 1ed15937013c7b4c98b739cf10527b8de9ac8ba3..0298f3fcc68b285ce95565123229648e72ce4479 100644 (file)
@@ -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))