renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

trailing_symlink: nd->depth massage, part 7

Browse Source 
move decrement of nd->depth on successful returns into the callers.

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

8
fs/namei.c
View File

@ -2009,10 +2009,8 @@ static int trailing_symlink(struct nameidata *nd)
s = get_link(nd);
if (unlikely(IS_ERR(s)))
return PTR_ERR(s);
if (unlikely(!s)) {
nd->depth--;
if (unlikely(!s))
return 0;
}
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
@ -2028,7 +2026,6 @@ static int trailing_symlink(struct nameidata *nd)
put_link(nd);
return error;
}
nd->depth--;
return 0;
}
@ -2069,6 +2066,7 @@ static int path_lookupat(int dfd, const struct filename *name,
if (err)
break;
err = lookup_last(nd);
nd->depth--;
put_link(nd);
}
}
@ -2418,6 +2416,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
if (err)
break;
err = mountpoint_last(nd, path);
nd->depth--;
put_link(nd);
}
out:
@ -3302,6 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if (unlikely(error))
break;
error = do_last(nd, file, op, &opened, pathname);
nd->depth--;
put_link(nd);
}
out: