leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

link_path_walk: nd->depth massage, part 9

Browse Source 
Make link_path_walk() work with any value of nd->depth on entry -
memorize it and use it in tests instead of comparing with 1.
Don't bother with increment/decrement in path_init().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-03 21:16:35 -04:00
parent 21c3003d36
commit dc7af8dc05
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/namei.c
View File

@ -1759,6 +1759,7 @@ static inline u64 hash_name(const char *name)
static int link_path_walk(const char *name, struct nameidata *nd)
{
int err;
int orig_depth = nd->depth;
while (*name=='/')
name++;
@ -1867,11 +1868,11 @@ Walked:
}
terminate_walk(nd);
Err:
while (unlikely(nd->depth > 1))
while (unlikely(nd->depth > orig_depth))
put_link(nd);
return err;
OK:
if (unlikely(nd->depth > 1)) {
if (unlikely(nd->depth > orig_depth)) {
name = nd->stack[nd->depth - 1].name;
err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd);
@ -1979,10 +1980,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags,
return -ECHILD;
done:
current->total_link_count = 0;
nd->depth++;
retval = link_path_walk(s, nd);
nd->depth--;
return retval;
return link_path_walk(s, nd);
}
static void path_cleanup(struct nameidata *nd)