diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-18 19:10:36 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:19:55 -0400 |
| commit | b0c24c3bdf237182b2f043bfee68bf886b0c9ad3 (patch) | |
| tree | 8949499c8abc350430fb772d0e86c1f82d7c6293 /fs | |
| parent | namei: rename follow_link to trailing_symlink, move it down (diff) | |
| download | linux-dev-b0c24c3bdf237182b2f043bfee68bf886b0c9ad3.tar.xz linux-dev-b0c24c3bdf237182b2f043bfee68bf886b0c9ad3.zip | |
link_path_walk: handle get_link() returning ERR_PTR() immediately
If we get ERR_PTR() from get_link(), we are guaranteed to get err != 0
when we break out of do-while, so we are going to hit if (err) return err;
shortly after it. Pull that into the if (IS_ERR(s)) body.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index d729ef7cbf46..99374704c17d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1792,7 +1792,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) if (unlikely(IS_ERR(s))) { err = PTR_ERR(s); - break; + current->link_count--; + nd->depth--; + return err; } err = 0; if (likely(s)) { |