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 3

Browse Source 
remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.

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

4
fs/namei.c
View File

@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd)
static inline int nd_alloc_stack(struct nameidata *nd) static inline int nd_alloc_stack(struct nameidata *nd)
{ {
if (likely(nd->depth != EMBEDDED_LEVELS - 1)) if (likely(nd->depth != EMBEDDED_LEVELS))
return 0; return 0;
if (likely(nd->stack != nd->internal)) if (likely(nd->stack != nd->internal))
return 0; return 0;
@ -1824,9 +1824,7 @@ Walked:
if (err) { if (err) {
const char *s; const char *s;
nd->depth--;
err = nd_alloc_stack(nd); err = nd_alloc_stack(nd);
nd->depth++;
if (unlikely(err)) { if (unlikely(err)) {
path_to_nameidata(&nd->link, nd); path_to_nameidata(&nd->link, nd);
break; break;