lkml.org 
[lkml]   [2020]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC][PATCH v4 37/69] do_last(): rejoing the common path earlier in FMODE_{OPENED,CREATED} case
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

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

    diff --git a/fs/namei.c b/fs/namei.c
    index 2eef41f505db..c85fdfd6b33d 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -3200,13 +3200,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;
    @@ -3214,10 +3207,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;
    @@ -3252,10 +3241,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
    \
     
     \ /
      Last update: 2020-03-14 00:55    [W:2.159 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site