From eecb3958e7e3df18527d6ae89ed817a176f4d8b4 Mon Sep 17 00:00:00 2001
From: Christopher Hoffman <choffman@redhat.com>
Date: Wed, 2 Jul 2025 13:50:25 +0000
Subject: [PATCH] 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>
---
 src/client/Client.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1356bf93c0f..69ec0a209b0 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -18204,8 +18204,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);
-- 
2.39.5