Merge pull request #44513 from batrick/i53714

pacific: mds: fails to reintegrate strays if destdn's directory is full (ENOSPC)

Reviewed-by: Milind Changire <mchangir@redhat.com>

diff --cc qa/tasks/cephfs/test_strays.py
Simple merge

diff --cc src/mds/Server.cc
index cb5a5ecb90e1b9c95e08ef1d3810a94d252c2443,0e4e821177258854aa61ffc7d4d644a91a0164c2..5715ed55a4696e7b4879a3ce5badbfe15f7567a2
--- 1/src/mds/Server.cc
--- 2/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@@ -8224,12 -8189,12 +8224,15 @@@ void Server::handle_client_rename(MDReq
      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_dir_max_entries(mdr, destdn->get_dir()))
 +      return;
 +
      if (!check_access(mdr, srci, MAY_WRITE))
        return;
    }