Commit bc401c29 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20240221171412.10710-10-krisman@suse.de


Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@suse.de>
parent be2760a7

fs/ubifs/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

fs/ubifs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -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;