]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
ceph: properly set DCACHE_NOKEY_NAME flag in lookup
authorJeff Layton <jlayton@kernel.org>
Tue, 26 Jan 2021 19:12:24 +0000 (14:12 -0500)
committerJeff Layton <jlayton@kernel.org>
Tue, 7 Dec 2021 15:32:47 +0000 (10:32 -0500)
This is required so that we know to invalidate these dentries when the
directory is unlocked.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
fs/ceph/dir.c

index 288f6f0b4b74b6f294791552a28b792c86cb0a17..4fa776d8fa53d51b3a161e5b88e694b9fafbdb02 100644 (file)
@@ -751,6 +751,17 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
        if (dentry->d_name.len > NAME_MAX)
                return ERR_PTR(-ENAMETOOLONG);
 
+       if (IS_ENCRYPTED(dir)) {
+               err = __fscrypt_prepare_readdir(dir);
+               if (err)
+                       return ERR_PTR(err);
+               if (!fscrypt_has_encryption_key(dir)) {
+                       spin_lock(&dentry->d_lock);
+                       dentry->d_flags |= DCACHE_NOKEY_NAME;
+                       spin_unlock(&dentry->d_lock);
+               }
+       }
+
        /* can we conclude ENOENT locally? */
        if (d_really_is_negative(dentry)) {
                struct ceph_inode_info *ci = ceph_inode(dir);