Skip to content

Commit bc401c2

Browse files
committed
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Gabriel Krisman Bertazi <[email protected]>
1 parent be2760a commit bc401c2

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

fs/ubifs/dir.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
205205
dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino);
206206

207207
err = fscrypt_prepare_lookup(dir, dentry, &nm);
208-
generic_set_encrypted_ci_d_ops(dentry);
209208
if (err == -ENOENT)
210209
return d_splice_alias(NULL, dentry);
211210
if (err)

fs/ubifs/super.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,6 +2239,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
22392239
goto out_umount;
22402240
}
22412241

2242+
generic_set_sb_d_ops(sb);
22422243
sb->s_root = d_make_root(root);
22432244
if (!sb->s_root) {
22442245
err = -ENOMEM;

0 commit comments

Comments
 (0)