namei: simpler treatment of symlinks with nothing other that / in the body
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 10 May 2015 14:50:41 +0000 (10:50 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 11 May 2015 02:20:16 +0000 (22:20 -0400)
Instead of saving name and branching to OK:, where we'll immediately restore
it, and call walk_component() with WALK_PUT|WALK_GET and nd->last_type being
LAST_BIND, which is equivalent to put_link(nd), err = 0, we can just treat
that the same way we'd treat procfs-style "jump" symlinks - do put_link(nd)
and move on.

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

index 678aeef854901e8ff890d28d1ea494caaaa22b0d..c5eb77a5797438df77ce8008b37d50c7096dd72a 100644 (file)
@@ -1865,11 +1865,13 @@ OK:
                                                ;
                                }
                                nd->inode = nd->path.dentry->d_inode;
-                               nd->stack[nd->depth - 1].name = name;
-                               if (!*s)
-                                       goto OK;
-                               name = s;
-                               continue;
+                               if (unlikely(!*s)) {
+                                       put_link(nd);
+                               } else {
+                                       nd->stack[nd->depth - 1].name = name;
+                                       name = s;
+                                       continue;
+                               }
                        }
                }
                if (!d_can_lookup(nd->path.dentry)) {