From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 25 Jan 2022 19:53:58 +0000 (-0800)
Subject: Merge pull request #44513 from batrick/i53714
X-Git-Tag: v16.2.8~232
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6873abbd0e837f2b6ab136f9a142e69e78b6c3ab;p=ceph.git

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>
---

6873abbd0e837f2b6ab136f9a142e69e78b6c3ab
diff --cc src/mds/Server.cc
index cb5a5ecb90e,0e4e8211772..5715ed55a46
--- a/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;
    }