summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-03 21:21:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-10 22:20:06 -0400
commit939724df56db970bdbaf8abcdc975c51482aba9b (patch)
tree4e0ec1d74f59af9ea9172a2d2248bbc5efb01de4 /fs
parentdc7af8dc05bc46410b978dae14fda8414b65db30 (diff)
downloadop-kernel-dev-939724df56db970bdbaf8abcdc975c51482aba9b.zip
op-kernel-dev-939724df56db970bdbaf8abcdc975c51482aba9b.tar.gz
link_path_walk: nd->depth massage, part 10
Get rid of orig_depth checks in OK: logics. If nd->depth is zero, we had been called from path_init() and we are done. If it is greater than 1, we are not done, whether we'd been called from path_init() or trailing_symlink(). And in case when it's 1, we might have been called from path_init() and reached the end of nested symlink (in which case nd->stack[0].name will point to the rest of pathname and we are not done) or from trailing_symlink(), in which case we are done. Just have trailing_symlink() leave NULL in nd->stack[0].name and use that to discriminate between those cases. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c
index bc6d67e..6febe25 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1872,13 +1872,15 @@ Err:
put_link(nd);
return err;
OK:
- if (unlikely(nd->depth > orig_depth)) {
- name = nd->stack[nd->depth - 1].name;
- err = walk_component(nd, LOOKUP_FOLLOW);
- put_link(nd);
- goto Walked;
- }
- return 0;
+ if (!nd->depth) /* called from path_init(), done */
+ return 0;
+ name = nd->stack[nd->depth - 1].name;
+ if (!name) /* called from trailing_symlink(), done */
+ return 0;
+
+ err = walk_component(nd, LOOKUP_FOLLOW);
+ put_link(nd);
+ goto Walked;
}
static int path_init(int dfd, const struct filename *name, unsigned int flags,
@@ -2014,6 +2016,7 @@ static int trailing_symlink(struct nameidata *nd)
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
+ nd->stack[0].name = NULL;
error = link_path_walk(s, nd);
if (unlikely(error))
put_link(nd);
OpenPOWER on IntegriCloud