Merge remote-tracking branch 'linus/master' into testing

1 files changed, 1 insertions, 13 deletions

diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c
index 7e787fb90293..07ab49745e31 100644
--- a/fs/efivarfs/inode.c
+++ b/fs/efivarfs/inode.c
@@ -155,20 +155,8 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry)
         return 0;
 };
 
-/*
- * Handle negative dentry.
- */
-static struct dentry *efivarfs_lookup(struct inode *dir, struct dentry *dentry,
-                                      unsigned int flags)
-{
-        if (dentry->d_name.len > NAME_MAX)
-                return ERR_PTR(-ENAMETOOLONG);
-        d_add(dentry, NULL);
-        return NULL;
-}
-
 const struct inode_operations efivarfs_dir_inode_operations = {
-        .lookup = efivarfs_lookup,
+        .lookup = simple_lookup,
         .unlink = efivarfs_unlink,
         .create = efivarfs_create,
 };