From: Christopher Hoffman <choffman@redhat.com>
Date: Wed, 2 Jul 2025 13:50:25 +0000 (+0000)
Subject: client: During fscrypt set policy check null dentries
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70e239e4b7ca242bb8cc300b886280cca57754fa;p=ceph.git

client: During fscrypt set policy check null dentries

During the dir empty check in set policy check null dentries.

Fixes: https://tracker.ceph.com/issues/71926
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d01f0b0d0d3..a60a912fd1f 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -18322,8 +18322,9 @@ int Client::ll_set_fscrypt_policy_v2(Inode *in, const struct fscrypt_policy_v2&
     return 0;
   }
 
-  if (in->is_dir() && in->dir && in->dir->dentries.size() > 0)
+  if (in->dir && in->dir->dentries.size() != in->dir->num_null_dentries) {
     return -ENOTEMPTY;
+  }
 
   FSCryptContext fsc(cct);
   fsc.init(policy);