kill LOOKUP_CONTINUE

LOOKUP_PARENT is equivalent to it now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 8 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 5e65f67ee926..f49d6abfa799 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -664,7 +664,7 @@ static int follow_automount(struct path *path, unsigned flags,
         /* We don't want to mount if someone supplied AT_NO_AUTOMOUNT
          * and this is the terminal part of the path.
          */
-        if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_CONTINUE))
+        if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_PARENT))
                 return -EISDIR; /* we actually want to stop here */
 
         /* We want to mount if someone is trying to open/create a file of any
@@ -676,7 +676,7 @@ static int follow_automount(struct path *path, unsigned flags,
          * appended a '/' to the name.
          */
         if (!(flags & LOOKUP_FOLLOW) &&
-            !(flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY |
+            !(flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY |
                        LOOKUP_OPEN | LOOKUP_CREATE)))
                 return -EISDIR;
 
@@ -695,7 +695,7 @@ static int follow_automount(struct path *path, unsigned flags,
                  * the path being looked up; if it wasn't then the remainder of
                  * the path is inaccessible and we should say so.
                  */
-                if (PTR_ERR(mnt) == -EISDIR && (flags & LOOKUP_CONTINUE))
+                if (PTR_ERR(mnt) == -EISDIR && (flags & LOOKUP_PARENT))
                         return -EREMOTE;
                 return PTR_ERR(mnt);
         }
@@ -1281,7 +1281,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 {
         struct path next;
         int err;
-        unsigned int lookup_flags = nd->flags;
         
         while (*name=='/')
                 name++;
@@ -1295,8 +1294,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
                 unsigned int c;
                 int type;
 
-                nd->flags |= LOOKUP_CONTINUE;
-
                 err = may_lookup(nd);
                 if (err)
                         break;
@@ -1358,8 +1355,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
                 /* here ends the main loop */
 
 last_component:
-                /* Clear LOOKUP_CONTINUE iff it was previously unset */
-                nd->flags &= lookup_flags | ~LOOKUP_CONTINUE;
                 nd->last = this;
                 nd->last_type = type;
                 return 0;