Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

link_path_walk: nd->depth massage, part 4

Browse Source 
lift increment/decrement into link_path_walk() callers.

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

10
fs/namei.c
View File

@ -1763,7 +1763,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (!*name)
return 0;
nd->depth++;
/* At this point we know we have a real path component. */
for(;;) {
u64 hash_len;
@ -1873,7 +1872,6 @@ Err:
nd->depth--;
put_link(nd);
}
nd->depth--;
return err;
OK:
if (unlikely(nd->depth > 1)) {
@ -1883,7 +1881,6 @@ OK:
put_link(nd);
goto Walked;
}
nd->depth--;
return 0;
}
@ -1986,7 +1983,10 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags,
return -ECHILD;
done:
current->total_link_count = 0;
return link_path_walk(s, nd);
nd->depth++;
retval = link_path_walk(s, nd);
nd->depth--;
return retval;
}
static void path_cleanup(struct nameidata *nd)
@ -2020,7 +2020,9 @@ static int trailing_symlink(struct nameidata *nd)
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
nd->depth++;
error = link_path_walk(s, nd);
nd->depth--;
if (unlikely(error))
put_link(nd);
return error;