lkml.org 
[lkml]   [2007]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch 8/10] mm: generic_file_buffered_write cleanup more
    Date
    No need to do the confusing switch of variables from copied into status.

    Signed-off-by: Nick Piggin <npiggin@suse.de>

    Index: linux-2.6/mm/filemap.c
    ===================================================================
    --- linux-2.6.orig/mm/filemap.c
    +++ linux-2.6/mm/filemap.c
    @@ -1898,28 +1898,22 @@ generic_file_buffered_write(struct kiocb
    goto fs_write_aop_error;

    if (likely(copied > 0)) {
    - if (!status)
    - status = copied;
    -
    - if (status >= 0) {
    - written += status;
    - count -= status;
    - pos += status;
    - buf += status;
    - if (unlikely(nr_segs > 1)) {
    - filemap_set_next_iovec(&cur_iov,
    - &iov_offset, status);
    - if (count)
    - buf = cur_iov->iov_base +
    - iov_offset;
    - } else {
    - iov_offset += status;
    - }
    + written += copied;
    + count -= copied;
    + pos += copied;
    + buf += copied;
    + if (unlikely(nr_segs > 1)) {
    + filemap_set_next_iovec(&cur_iov,
    + &iov_offset, copied);
    + if (count)
    + buf = cur_iov->iov_base + iov_offset;
    + } else {
    + iov_offset += copied;
    }
    }
    if (unlikely(copied != bytes))
    - if (status >= 0)
    - status = -EFAULT;
    + status = -EFAULT;
    +
    unlock_page(page);
    mark_page_accessed(page);
    page_cache_release(page);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-01-13 05:09    [W:0.021 / U:31.928 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site