GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-30 10:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do_last(): rejoing the common path earlier in FMODE_{OPENED,CREATED} case

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-01-26 10:32:22 -05:00
parent 59e96e6583
commit 5a2d3edd8d
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
fs/namei.c
View file

@ -3200,13 +3200,6 @@ static const char *do_last(struct nameidata *nd,
return ERR_CAST(dentry); return ERR_CAST(dentry);
if (file->f_mode & FMODE_OPENED) { 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); audit_inode(nd->name, file->f_path.dentry, 0);
dput(nd->path.dentry); dput(nd->path.dentry);
nd->path.dentry = dentry; nd->path.dentry = dentry;
@ -3214,10 +3207,6 @@ static const char *do_last(struct nameidata *nd,
} }
if (file->f_mode & FMODE_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;
dput(nd->path.dentry); dput(nd->path.dentry);
nd->path.dentry = dentry; nd->path.dentry = dentry;
goto finish_open_created; goto finish_open_created;
@ -3252,10 +3241,16 @@ finish_open:
} }
if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry)) if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
return ERR_PTR(-ENOTDIR); return ERR_PTR(-ENOTDIR);
if (!d_is_reg(nd->path.dentry))
will_truncate = false;
finish_open_created: 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) { if (will_truncate) {
error = mnt_want_write(nd->path.mnt); error = mnt_want_write(nd->path.mnt);
if (error) if (error)