Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fscrypt updates from Ted Ts'o:
 "Clean up fscrypt's dcache revalidation support, and other
  miscellaneous cleanups"

* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: cache decrypted symlink target in ->i_link
  vfs: use READ_ONCE() to access ->i_link
  fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext
  fscrypt: only set dentry_operations on ciphertext dentries
  fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory
  fscrypt: fix race allowing rename() and link() of ciphertext dentries
  fscrypt: clean up and improve dentry revalidation
  fscrypt: use READ_ONCE() to access ->i_crypt_info
  fscrypt: remove WARN_ON_ONCE() when decryption fails
  fscrypt: drop inode argument from fscrypt_get_ctx()

2 files changed, 6 insertions, 5 deletions

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 5767b373a8ff..b73de6d04fa3 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -220,11 +220,9 @@ 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, flags);
-        if (err)
-                return ERR_PTR(err);
-
-        err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
+        err = fscrypt_prepare_lookup(dir, dentry, &nm);
+        if (err == -ENOENT)
+                return d_splice_alias(NULL, dentry);
         if (err)
                 return ERR_PTR(err);
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index c2307c423638..632f02d4d660 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -275,7 +275,10 @@ static struct inode *ubifs_alloc_inode(struct super_block *sb)
 static void ubifs_free_inode(struct inode *inode)
 {
         struct ubifs_inode *ui = ubifs_inode(inode);
+
         kfree(ui->data);
+        fscrypt_free_inode(inode);
+
         kmem_cache_free(ubifs_inode_slab, ui);
 }