path_init(): don't bother with LOOKUP_PARENT in argument
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 20 Nov 2014 19:20:24 +0000 (14:20 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 21:27:57 +0000 (16:27 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namei.c

index cfebb4f..285001f 100644 (file)
@@ -1851,7 +1851,7 @@ static int path_init(int dfd, const char *name, unsigned int flags,
        int retval = 0;
 
        nd->last_type = LAST_ROOT; /* if there are only slashes... */
-       nd->flags = flags | LOOKUP_JUMPED;
+       nd->flags = flags | LOOKUP_JUMPED | LOOKUP_PARENT;
        nd->depth = 0;
        nd->base = NULL;
        if (flags & LOOKUP_ROOT) {
@@ -1983,7 +1983,7 @@ static int path_lookupat(int dfd, const char *name,
         * be handled by restarting a traditional ref-walk (which will always
         * be able to complete).
         */
-       err = path_init(dfd, name, flags | LOOKUP_PARENT, nd);
+       err = path_init(dfd, name, flags, nd);
 
        if (unlikely(err))
                goto out;
@@ -2329,7 +2329,7 @@ path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags
        struct nameidata nd;
        int err;
 
-       err = path_init(dfd, name, flags | LOOKUP_PARENT, &nd);
+       err = path_init(dfd, name, flags, &nd);
        if (unlikely(err))
                goto out;
 
@@ -3220,7 +3220,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
                goto out;
        }
 
-       error = path_init(dfd, pathname->name, flags | LOOKUP_PARENT, nd);
+       error = path_init(dfd, pathname->name, flags, nd);
        if (unlikely(error))
                goto out;