lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 10/72] ext4: check error return from ext4_write_inline_data_end()
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Theodore Ts'o <tytso@mit.edu>

    commit 42c832debbbf819f6c4ad8601baa559c44105ba4 upstream.

    The function ext4_write_inline_data_end() can return an error. So we
    need to assign it to a signed integer variable to check for an error
    return (since copied is an unsigned int).

    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: Zheng Liu <wenqing.lz@taobao.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/inode.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -1118,10 +1118,13 @@ static int ext4_write_end(struct file *f
    }
    }

    - if (ext4_has_inline_data(inode))
    - copied = ext4_write_inline_data_end(inode, pos, len,
    - copied, page);
    - else
    + if (ext4_has_inline_data(inode)) {
    + ret = ext4_write_inline_data_end(inode, pos, len,
    + copied, page);
    + if (ret < 0)
    + goto errout;
    + copied = ret;
    + } else
    copied = block_write_end(file, mapping, pos,
    len, copied, page, fsdata);




    \
     
     \ /
      Last update: 2013-07-19 08:42    [W:4.173 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site