From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Make link_path_walk() work with any value of nd->depth on entry -
memorize it and use it in tests instead of comparing with 1.
Don't bother with increment/decrement in path_init().
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 0713961..10cb0be 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1751,6 +1751,7 @@ static inline u64 hash_name(const char *name)
static int link_path_walk(const char *name, struct nameidata *nd)
{
int err;
+ int orig_depth = nd->depth;
while (*name=='/')
name++;
@@ -1859,11 +1860,11 @@ Walked:
}
terminate_walk(nd);
Err:
- while (unlikely(nd->depth > 1))
+ while (unlikely(nd->depth > orig_depth))
put_link(nd);
return err;
OK:
- if (unlikely(nd->depth > 1)) {
+ if (unlikely(nd->depth > orig_depth)) {
name = nd->stack[nd->depth - 1].name;
err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd);
@@ -1971,10 +1972,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags,
return -ECHILD;
done:
current->total_link_count = 0;
- nd->depth++;
- retval = link_path_walk(s, nd);
- nd->depth--;
- return retval;
+ return link_path_walk(s, nd);
}
static void path_cleanup(struct nameidata *nd)
--
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
