Commit 43679723 authored by Al Viro's avatar Al Viro

merging pick_link() with get_link(), part 1

Move restoring LOOKUP_PARENT and zeroing nd->stack.name[0] past
the call of get_link() (nothing _currently_ uses them in there).
That allows to moved the call of may_follow_link() into get_link()
as well, since now the presence of LOOKUP_PARENT distinguishes
the callers from each other (link_path_walk() has it, trailing_symlink()
doesn't).

Preparations for folding trailing_symlink() into callers (lookup_last()
and do_last()) and changing the calling conventions of those.  Next
stage after that will have get_link() call migrate into walk_component(),
then - into step_into().  It's tricky enough to warrant doing that
in stages, unfortunately...
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a9dc1494
...@@ -1115,6 +1115,12 @@ const char *get_link(struct nameidata *nd) ...@@ -1115,6 +1115,12 @@ const char *get_link(struct nameidata *nd)
int error; int error;
const char *res; const char *res;
if (!(nd->flags & LOOKUP_PARENT)) {
error = may_follow_link(nd);
if (unlikely(error))
return ERR_PTR(error);
}
if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS)) if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS))
return ERR_PTR(-ELOOP); return ERR_PTR(-ELOOP);
...@@ -2329,13 +2335,9 @@ static const char *path_init(struct nameidata *nd, unsigned flags) ...@@ -2329,13 +2335,9 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
static const char *trailing_symlink(struct nameidata *nd) static const char *trailing_symlink(struct nameidata *nd)
{ {
const char *s; const char *s = get_link(nd);
int error = may_follow_link(nd);
if (unlikely(error))
return ERR_PTR(error);
nd->flags |= LOOKUP_PARENT; nd->flags |= LOOKUP_PARENT;
nd->stack[0].name = NULL; nd->stack[0].name = NULL;
s = get_link(nd);
return s ? s : ""; return s ? s : "";
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment