lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 55/79] link_path_walk: nd->depth massage, part 4
Date
From: Al Viro <viro@zeniv.linux.org.uk>

lift increment/decrement into link_path_walk() callers.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
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


\
 
 \ /
  Last update: 2015-05-05 07:41    [W:0.599 / U:17.708 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site