]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: skip directory size checks for reintegration 44668/head
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Dec 2021 15:00:29 +0000 (10:00 -0500)
committerVicente Cheng <freeze.bilsted@gmail.com>
Wed, 19 Jan 2022 14:30:57 +0000 (14:30 +0000)
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

src/mds/Server.cc

index 4100043164036d89ed5ed2a35d8d026504a5ad90..d867b63ae66868080f5791462129dfe6bcfdf8f0 100644 (file)
@@ -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))