Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 5dbadecb234da01be9cc7eb5705e71363da7dfea..574bafc41f0b7c1f77160971ebb9ca6d5a8121e6 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -199,10 +199,10 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
 
 static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
 {
-       if (!proc_lookup(dir, dentry, flags))
+       if (!proc_pid_lookup(dir, dentry, flags))
                return NULL;
        
-       return proc_pid_lookup(dir, dentry, flags);
+       return proc_lookup(dir, dentry, flags);
 }
 
 static int proc_root_readdir(struct file *file, struct dir_context *ctx)