[RFC][PATCH v2 31/34] do_last(): rejoing the common path earlier in FMODE_{OPENED,CREATED} case

Al Viro
2020-02-23T01:25:30Z

fs/namei.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 56285466aa55..51283caaf7c4 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3208,13 +3208,6 @@ static const char *do_last(struct nameidata *nd,
return ERR_CAST(dentry);

if (file->f_mode & FMODE_OPENED) {
- if (file->f_mode & FMODE_CREATED) {
- open_flag &= ~O_TRUNC;
- will_truncate = false;
- acc_mode = 0;
- } else if (!S_ISREG(file_inode(file)->i_mode))
- will_truncate = false;
-
audit_inode(nd->name, file->f_path.dentry, 0);
dput(nd->path.dentry);
nd->path.dentry = dentry;
@@ -3222,10 +3215,6 @@ static const char *do_last(struct nameidata *nd,
}

if (file->f_mode & FMODE_CREATED) {
- /* Don't check for write permission, don't truncate */
- open_flag &= ~O_TRUNC;
- will_truncate = false;
- acc_mode = 0;
dput(nd->path.dentry);
nd->path.dentry = dentry;
goto finish_open_created;
@@ -3260,10 +3249,16 @@ static const char *do_last(struct nameidata *nd,
}
if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
return ERR_PTR(-ENOTDIR);
- if (!d_is_reg(nd->path.dentry))
- will_truncate = false;

finish_open_created:
+ if (file->f_mode & FMODE_CREATED) {
+ /* Don't check for write permission, don't truncate */
+ open_flag &= ~O_TRUNC;
+ will_truncate = false;
+ acc_mode = 0;
+ } else if (!d_is_reg(nd->path.dentry)) {
+ will_truncate = false;
+ }
if (will_truncate) {
error = mnt_want_write(nd->path.mnt);
if (error)
--
2.11.0