From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
lift increment/decrement into link_path_walk() callers.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 0d1fcaf..800cf7e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1755,7 +1755,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;
@@ -1865,7 +1864,6 @@ Err:
nd->depth--;
put_link(nd);
}
- nd->depth--;
return err;
OK:
if (unlikely(nd->depth > 1)) {
@@ -1875,7 +1873,6 @@ OK:
put_link(nd);
goto Walked;
}
- nd->depth--;
return 0;
}
@@ -1978,7 +1975,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)
@@ -2012,7 +2012,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;
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
