diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-05-04 08:15:36 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:20:10 -0400 |
| commit | 1bc4b813e8e5bda23a31892712e04905f0c7ffba (patch) | |
| tree | 0f08ff631cb0b524a6e07124e4852a89a215f9f6 | |
| parent | lift terminate_walk() into callers of walk_component() (diff) | |
| download | linux-dev-1bc4b813e8e5bda23a31892712e04905f0c7ffba.tar.xz linux-dev-1bc4b813e8e5bda23a31892712e04905f0c7ffba.zip | |
namei: lift (open-coded) terminate_walk() into callers of get_link()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index d99eaacab2a7..db21e0426193 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -892,7 +892,6 @@ const char *get_link(struct nameidata *nd) mntget(nd->link.mnt); if (unlikely(current->total_link_count >= MAXSYMLINKS)) { - path_put(&nd->path); path_put(&nd->link); return ERR_PTR(-ELOOP); } @@ -916,7 +915,6 @@ const char *get_link(struct nameidata *nd) res = inode->i_op->follow_link(dentry, &last->cookie, nd); if (IS_ERR(res)) { out: - path_put(&nd->path); path_put(&last->link); return res; } @@ -1827,7 +1825,7 @@ Walked: if (unlikely(IS_ERR(s))) { err = PTR_ERR(s); - goto Err; + break; } err = 0; if (unlikely(!s)) { @@ -1858,7 +1856,6 @@ Walked: } } terminate_walk(nd); -Err: while (unlikely(nd->depth)) put_link(nd); return err; @@ -1994,8 +1991,10 @@ static int trailing_symlink(struct nameidata *nd) return error; nd->flags |= LOOKUP_PARENT; s = get_link(nd); - if (unlikely(IS_ERR(s))) + if (unlikely(IS_ERR(s))) { + terminate_walk(nd); return PTR_ERR(s); + } if (unlikely(!s)) return 0; if (*s == '/') { |