From: Gabriel Krisman Bertazi Date: Wed, 21 Feb 2024 17:14:11 +0000 (-0500) Subject: ubifs: Configure dentry operations at dentry-creation time X-Git-Tag: v6.9-rc1~222^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc401c2900c128d3d69482769f1300502a9f0598;p=thirdparty%2Fkernel%2Flinux.git ubifs: Configure dentry operations at dentry-creation time fscrypt now supports configuring dentry operations at dentry-creation time through the preset sb->s_d_op, instead of at lookup time. Enable this in ubifs, since the lookup-time mechanism is going away. Reviewed-by: Eric Biggers Link: https://lore.kernel.org/r/20240221171412.10710-10-krisman@suse.de Signed-off-by: Gabriel Krisman Bertazi --- diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 3b13c648d4900..51b9a10a9851c 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -205,7 +205,6 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry, dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino); err = fscrypt_prepare_lookup(dir, dentry, &nm); - generic_set_encrypted_ci_d_ops(dentry); if (err == -ENOENT) return d_splice_alias(NULL, dentry); if (err) diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 09e270d6ed025..304646b03e999 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2239,6 +2239,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) goto out_umount; } + generic_set_sb_d_ops(sb); sb->s_root = d_make_root(root); if (!sb->s_root) { err = -ENOMEM;