lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 105/150] excessive checks in ufs_write_failed() and ufs_evict_inode()
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit babef37dccbaa49249a22bae9150686815d7be71 upstream.

    As it is, short copy in write() to append-only file will fail
    to truncate the excessive allocated blocks. As the matter of
    fact, all checks in ufs_truncate_blocks() are either redundant
    or wrong for that caller. As for the only other caller
    (ufs_evict_inode()), we only need the file type checks there.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ufs/inode.c | 18 +++++-------------
    1 file changed, 5 insertions(+), 13 deletions(-)

    --- a/fs/ufs/inode.c
    +++ b/fs/ufs/inode.c
    @@ -844,7 +844,9 @@ void ufs_evict_inode(struct inode * inod
    truncate_inode_pages_final(&inode->i_data);
    if (want_delete) {
    inode->i_size = 0;
    - if (inode->i_blocks)
    + if (inode->i_blocks &&
    + (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
    + S_ISLNK(inode->i_mode)))
    ufs_truncate_blocks(inode);
    }

    @@ -1103,7 +1105,7 @@ out:
    return err;
    }

    -static void __ufs_truncate_blocks(struct inode *inode)
    +static void ufs_truncate_blocks(struct inode *inode)
    {
    struct ufs_inode_info *ufsi = UFS_I(inode);
    struct super_block *sb = inode->i_sb;
    @@ -1186,7 +1188,7 @@ static int ufs_truncate(struct inode *in

    truncate_setsize(inode, size);

    - __ufs_truncate_blocks(inode);
    + ufs_truncate_blocks(inode);
    inode->i_mtime = inode->i_ctime = current_time(inode);
    mark_inode_dirty(inode);
    out:
    @@ -1194,16 +1196,6 @@ out:
    return err;
    }

    -static void ufs_truncate_blocks(struct inode *inode)
    -{
    - if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
    - S_ISLNK(inode->i_mode)))
    - return;
    - if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
    - return;
    - __ufs_truncate_blocks(inode);
    -}
    -
    int ufs_setattr(struct dentry *dentry, struct iattr *attr)
    {
    struct inode *inode = d_inode(dentry);

    \
     
     \ /
      Last update: 2017-06-12 20:55    [W:4.062 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site