diff options
| author | Al Viro | 2015-05-03 20:54:27 -0400 |
|---|---|---|
| committer | Al Viro | 2015-05-10 22:20:03 -0400 |
| commit | ef1a3e7b9634cc68740eb1280309ac5e460b95f9 (patch) | |
| tree | 3b00262ba4d5ad3d59ac4992c660d0c3fe8b4fe3 /fs | |
| parent | da4e0be04d8816bbb9420c1da05ce09f502c5b75 (diff) | |
link_path_walk: nd->depth massage, part 4
lift increment/decrement into link_path_walk() callers.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 3df4731a7467..cf5009b87c5a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -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; |