namei: move link/cookie pairs into nameidata

[cascardo/linux.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 9844bb2..d4b238a 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -505,6 +505,11 @@ struct nameidata {
        int             last_type;
        unsigned        depth;
        struct file     *base;
+       struct saved {
+               struct path link;
+               void *cookie;
+               const char *name;
+       } stack[MAX_NESTED_LINKS + 1];
 };
 
 /*
@@ -1711,18 +1716,13 @@ static inline u64 hash_name(const char *name)
  */
 static int link_path_walk(const char *name, struct nameidata *nd)
 {
-       struct saved {
-               struct path link;
-               void *cookie;
-               const char *name;
-       } stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1;
+       struct saved *last = nd->stack;
        int err;
 
-start:
        while (*name=='/')
                name++;
        if (!*name)
-               goto OK;
+               return 0;
 
        /* At this point we know we have a real path component. */
        for(;;) {
@@ -1821,28 +1821,15 @@ Walked:
                                        nd->path = nd->root;
                                        path_get(&nd->root);
                                        nd->flags |= LOOKUP_JUMPED;
+                                       while (unlikely(*++s == '/'))
+                                               ;
                                }
                                nd->inode = nd->path.dentry->d_inode;
                                last->name = name;
+                               if (!*s)
+                                       goto OK;
                                name = s;
-                               goto start;
-
-back:
-                               name = last->name;
-                               if (unlikely(err)) {
-                                       put_link(nd, &last->link, last->cookie);
-                                       current->link_count--;
-                                       nd->depth--;
-                                       last--;
-                                       goto Err;
-                               } else {
-                                       err = walk_component(nd, LOOKUP_FOLLOW);
-                                       put_link(nd, &last->link, last->cookie);
-                                       current->link_count--;
-                                       nd->depth--;
-                                       last--;
-                                       goto Walked;
-                               }
+                               continue;
                        }
                }
                if (!d_can_lookup(nd->path.dentry)) {
@@ -1852,13 +1839,24 @@ back:
        }
        terminate_walk(nd);
 Err:
-       if (likely(!nd->depth))
-               return err;
-       goto back;
+       while (unlikely(nd->depth)) {
+               put_link(nd, &last->link, last->cookie);
+               current->link_count--;
+               nd->depth--;
+               last--;
+       }
+       return err;
 OK:
-       if (likely(!nd->depth))
-               return 0;
-       goto back;
+       if (unlikely(nd->depth)) {
+               name = last->name;
+               err = walk_component(nd, LOOKUP_FOLLOW);
+               put_link(nd, &last->link, last->cookie);
+               current->link_count--;
+               nd->depth--;
+               last--;
+               goto Walked;
+       }
+       return 0;
 }
 
 static int path_init(int dfd, const struct filename *name, unsigned int flags,
@@ -2033,13 +2031,13 @@ static int path_lookupat(int dfd, const struct filename *name,
        if (!err && !(flags & LOOKUP_PARENT)) {
                err = lookup_last(nd);
                while (err > 0) {
-                       void *cookie;
-                       struct path link = nd->link;
-                       err = trailing_symlink(&link, nd, &cookie);
+                       nd->stack[0].link = nd->link;
+                       err = trailing_symlink(&nd->stack[0].link,
+                                               nd, &nd->stack[0].cookie);
                        if (err)
                                break;
                        err = lookup_last(nd);
-                       put_link(nd, &link, cookie);
+                       put_link(nd, &nd->stack[0].link, nd->stack[0].cookie);
                }
        }
 
@@ -2379,13 +2377,13 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
 
        err = mountpoint_last(nd, path);
        while (err > 0) {
-               void *cookie;
-               struct path link = *path;
-               err = trailing_symlink(&link, nd, &cookie);
+               nd->stack[0].link = nd->link;
+               err = trailing_symlink(&nd->stack[0].link,
+                                       nd, &nd->stack[0].cookie);
                if (err)
                        break;
                err = mountpoint_last(nd, path);
-               put_link(nd, &link, cookie);
+               put_link(nd, &nd->stack[0].link, nd->stack[0].cookie);
        }
 out:
        path_cleanup(nd);
@@ -3262,14 +3260,14 @@ static struct file *path_openat(int dfd, struct filename *pathname,
 
        error = do_last(nd, file, op, &opened, pathname);
        while (unlikely(error > 0)) { /* trailing symlink */
-               struct path link = nd->link;
-               void *cookie;
                nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL);
-               error = trailing_symlink(&link, nd, &cookie);
+               nd->stack[0].link = nd->link;
+               error= trailing_symlink(&nd->stack[0].link,
+                                       nd, &nd->stack[0].cookie);
                if (unlikely(error))
                        break;
                error = do_last(nd, file, op, &opened, pathname);
-               put_link(nd, &link, cookie);
+               put_link(nd, &nd->stack[0].link, nd->stack[0].cookie);
        }
 out:
        path_cleanup(nd);