提交 939724df 编写于 作者: A Al Viro

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: NAl Viro <viro@zeniv.linux.org.uk>
上级 dc7af8dc
......@@ -1872,13 +1872,15 @@ static int link_path_walk(const char *name, struct nameidata *nd)
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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册