[RFC][PATCH v3 33/55] do_last(): merge the may_open() calls

Al Viro
2020-03-01T21:54:20Z

have FMODE_OPENED case rejoin the main path at earlier point

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 9fcb8f635e66..91346e5d8bd8 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3211,10 +3211,7 @@ static const char *do_last(struct nameidata *nd,
audit_inode(nd->name, file->f_path.dentry, 0);
dput(nd->path.dentry);
nd->path.dentry = dentry;
- error = may_open(&nd->path, acc_mode, open_flag);
- if (error)
- goto out;
- goto opened;
+ goto finish_open_created;
}

if (file->f_mode & FMODE_CREATED) {
@@ -3280,11 +3277,10 @@ static const char *do_last(struct nameidata *nd,
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
- BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */
- error = vfs_open(&nd->path, file);
+ if (!(file->f_mode & FMODE_OPENED))
+ error = vfs_open(&nd->path, file);
if (error)
goto out;
-opened:
error = ima_file_check(file, op->acc_mode);
if (!error && will_truncate)
error = handle_truncate(file);
--
2.11.0