Messages in this thread Patch in this message | | | From | Al Viro <> | Subject | [PATCH 14/24] link_path_walk: get rid of duplication | Date | Mon, 20 Apr 2015 19:12:58 +0100 |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
What we do after the second walk_component() + put_link() + depth decrement in there is exactly equivalent to what's done right after the first walk_component(). Easy to verify and not at all surprising, seeing that there we have just walked the last component of nested symlink.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- fs/namei.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index 06f1aa3..9cef3c0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1828,6 +1828,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) return 0; err = walk_component(nd, &next, LOOKUP_FOLLOW); +Walked: if (err < 0) return err; @@ -1846,7 +1847,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) nd->depth++; nd->link_count++; -l: link = next; s = get_link(&link, nd, &cookie); @@ -1883,13 +1883,7 @@ l: put_link(nd, &link, cookie); nd->link_count--; nd->depth--; - if (err < 0) - return err; - if (err > 0) { - nd->link_count++; - nd->depth++; - goto l; - } + goto Walked; } } } -- 2.1.4
| |