diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2018-07-09 16:38:06 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-12 10:04:31 -0400 |
| commit | 5f336e722cc961be94d264d96b90c92888fffae1 (patch) | |
| tree | 0f28ce677fb862302edf14adb9782e6ef0f4587c /fs/namei.c | |
| parent | allow link_path_walk() to take ERR_PTR() (diff) | |
| download | wireguard-linux-5f336e722cc961be94d264d96b90c92888fffae1.tar.xz wireguard-linux-5f336e722cc961be94d264d96b90c92888fffae1.zip | |
few more cleanups of link_path_walk() callers
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/fs/namei.c b/fs/namei.c index 22535f133200..278e494bcbd2 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2269,10 +2269,8 @@ static int path_lookupat(struct nameidata *nd, unsigned flags, struct path *path if (unlikely(flags & LOOKUP_DOWN) && !IS_ERR(s)) { err = handle_lookup_down(nd); - if (unlikely(err < 0)) { - terminate_walk(nd); - return err; - } + if (unlikely(err < 0)) + s = ERR_PTR(err); } while (!(err = link_path_walk(s, nd)) @@ -3472,7 +3470,6 @@ static int do_o_path(struct nameidata *nd, unsigned flags, struct file *file) static struct file *path_openat(struct nameidata *nd, const struct open_flags *op, unsigned flags) { - const char *s; struct file *file; int error; @@ -3482,22 +3479,17 @@ static struct file *path_openat(struct nameidata *nd, if (unlikely(file->f_flags & __O_TMPFILE)) { error = do_tmpfile(nd, flags, op, file); - goto out2; - } - - if (unlikely(file->f_flags & O_PATH)) { + } else if (unlikely(file->f_flags & O_PATH)) { error = do_o_path(nd, flags, file); - goto out2; - } - - s = path_init(nd, flags); - while (!(error = link_path_walk(s, nd)) && - (error = do_last(nd, file, op)) > 0) { - nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); - s = trailing_symlink(nd); + } else { + const char *s = path_init(nd, flags); + while (!(error = link_path_walk(s, nd)) && + (error = do_last(nd, file, op)) > 0) { + nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); + s = trailing_symlink(nd); + } + terminate_walk(nd); } - terminate_walk(nd); -out2: if (likely(!error)) { if (likely(file->f_mode & FMODE_OPENED)) return file; |