lkml.org 
[lkml]   [2016]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 34/41] ext4: handle huge pages in ext4_da_write_end()
    Date
    Call ext4_da_should_update_i_disksize() for head page with offset
    relative to head page.

    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    ---
    fs/ext4/inode.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
    index 1c325f62e766..0133f6fc4bb8 100644
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -3006,7 +3006,6 @@ static int ext4_da_write_end(struct file *file,
    int ret = 0, ret2;
    handle_t *handle = ext4_journal_current_handle();
    loff_t new_i_size;
    - unsigned long start, end;
    int write_mode = (int)(unsigned long)fsdata;

    if (write_mode == FALL_BACK_TO_NONDELALLOC)
    @@ -3014,8 +3013,6 @@ static int ext4_da_write_end(struct file *file,
    len, copied, page, fsdata);

    trace_ext4_da_write_end(inode, pos, len, copied);
    - start = pos & (PAGE_SIZE - 1);
    - end = start + copied - 1;

    /*
    * generic_write_end() will run mark_inode_dirty() if i_size
    @@ -3024,8 +3021,10 @@ static int ext4_da_write_end(struct file *file,
    */
    new_i_size = pos + copied;
    if (copied && new_i_size > EXT4_I(inode)->i_disksize) {
    + struct page *head = compound_head(page);
    + unsigned long end = (pos & ~hpage_mask(head)) + copied - 1;
    if (ext4_has_inline_data(inode) ||
    - ext4_da_should_update_i_disksize(page, end)) {
    + ext4_da_should_update_i_disksize(head, end)) {
    ext4_update_i_disksize(inode, new_i_size);
    /* We need to mark inode dirty even if
    * new_i_size is less that inode->i_size
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:4.082 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site