diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-09 22:54:45 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-11 14:13:08 +0200 |
| commit | 3595e2346cd91c223efddc79353fe7ced81f21bf (patch) | |
| tree | 200c7d2190ea809f314ea06034cd9640fd5f8f63 | |
| parent | namei: lift terminate_walk() all the way up (diff) | |
| download | linux-3595e2346cd91c223efddc79353fe7ced81f21bf.tar.xz linux-3595e2346cd91c223efddc79353fe7ced81f21bf.zip | |
link_path_walk: use explicit returns for failure exits
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/fs/namei.c b/fs/namei.c index 27c38591b4ec..756e150c28fc 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1772,7 +1772,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) err = may_lookup(nd); if (err) - break; + return err; hash_len = hash_name(name); @@ -1794,7 +1794,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) struct qstr this = { { .hash_len = hash_len }, .name = name }; err = parent->d_op->d_hash(parent, &this); if (err < 0) - break; + return err; hash_len = this.hash_len; name = this.name; } @@ -1829,15 +1829,13 @@ OK: err = walk_component(nd, WALK_GET); } if (err < 0) - break; + return err; if (err) { const char *s = get_link(nd); - if (unlikely(IS_ERR(s))) { - err = PTR_ERR(s); - break; - } + if (unlikely(IS_ERR(s))) + return PTR_ERR(s); err = 0; if (unlikely(!s)) { /* jumped */ @@ -1848,12 +1846,9 @@ OK: continue; } } - if (!d_can_lookup(nd->path.dentry)) { - err = -ENOTDIR; - break; - } + if (unlikely(!d_can_lookup(nd->path.dentry))) + return -ENOTDIR; } - return err; } static const char *path_init(int dfd, const struct filename *name, |