Merge tag 'for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[linux-2.6-block.git] / fs / kernfs / mount.c

diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index 3d670a3678f2dd6dc24dc9db23ca9cd5a63ab0ed..63534f5f9073c364bacd619a2a07e75617e4ece2 100644 (file)
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -135,9 +135,8 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn,
                kntmp = find_next_ancestor(kn, knparent);
                if (WARN_ON(!kntmp))
                        return ERR_PTR(-EINVAL);
-               mutex_lock(&d_inode(dentry)->i_mutex);
-               dtmp = lookup_one_len(kntmp->name, dentry, strlen(kntmp->name));
-               mutex_unlock(&d_inode(dentry)->i_mutex);
+               dtmp = lookup_one_len_unlocked(kntmp->name, dentry,
+                                              strlen(kntmp->name));
                dput(dentry);
                if (IS_ERR(dtmp))
                        return dtmp;