Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

few more cleanups of link_path_walk() callers

Browse Source 
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-07-09 16:38:06 -04:00
parent 9b5858e99a
commit 5f336e722c
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/namei.c
View File

@ -2269,10 +2269,8 @@ static int path_lookupat(struct nameidata *nd, unsigned flags, struct path *path
if (unlikely(flags & LOOKUP_DOWN) && !IS_ERR(s)) { if (unlikely(flags & LOOKUP_DOWN) && !IS_ERR(s)) {
err = handle_lookup_down(nd); err = handle_lookup_down(nd);
if (unlikely(err < 0)) { if (unlikely(err < 0))
terminate_walk(nd); s = ERR_PTR(err);
return err;
}
} }
while (!(err = link_path_walk(s, nd)) 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, static struct file *path_openat(struct nameidata *nd,
const struct open_flags *op, unsigned flags) const struct open_flags *op, unsigned flags)
{ {
const char *s;
struct file *file; struct file *file;
int error; int error;
@ -3482,22 +3479,17 @@ static struct file *path_openat(struct nameidata *nd,
if (unlikely(file->f_flags & __O_TMPFILE)) { if (unlikely(file->f_flags & __O_TMPFILE)) {
error = do_tmpfile(nd, flags, op, file); error = do_tmpfile(nd, flags, op, file);
goto out2; } else if (unlikely(file->f_flags & O_PATH)) {
}
if (unlikely(file->f_flags & O_PATH)) {
error = do_o_path(nd, flags, file); error = do_o_path(nd, flags, file);
goto out2; } 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);
} }
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);
out2:
if (likely(!error)) { if (likely(!error)) {
if (likely(file->f_mode & FMODE_OPENED)) if (likely(file->f_mode & FMODE_OPENED))
return file; return file;