summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-20 14:20:24 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-11 16:27:57 -0500
commit980f3ea2f650b0416c7768af09f4dcbd464d6e43 (patch)
treed886370d7a68a38a083222fa0ed145cf755b5731 /fs
parent893b7775a70e2e2050d5c3829996e906f7a3410c (diff)
downloadlinux-980f3ea2f650b0416c7768af09f4dcbd464d6e43.tar.bz2
path_init(): don't bother with LOOKUP_PARENT in argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index cfebb4fe675d..285001f7b84e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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;