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 2/10] mm: revert "generic_file_buffered_write(): handle zero length iovec segments"
    Date
    From: Andrew Morton <akpm@osdl.org>

    Revert 81b0c8713385ce1b1b9058e916edcf9561ad76d6.

    This was a bugfix against 6527c2bdf1f833cc18e8f42bd97973d583e4aa83, which we
    also revert.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    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
    @@ -1911,12 +1911,6 @@ generic_file_buffered_write(struct kiocb
    break;
    }

    - if (unlikely(bytes == 0)) {
    - status = 0;
    - copied = 0;
    - goto zero_length_segment;
    - }
    -
    status = a_ops->prepare_write(file, page, offset, offset+bytes);
    if (unlikely(status)) {
    loff_t isize = i_size_read(inode);
    @@ -1946,8 +1940,7 @@ generic_file_buffered_write(struct kiocb
    page_cache_release(page);
    continue;
    }
    -zero_length_segment:
    - if (likely(copied >= 0)) {
    + if (likely(copied > 0)) {
    if (!status)
    status = copied;

    Index: linux-2.6/mm/filemap.h
    ===================================================================
    --- linux-2.6.orig/mm/filemap.h
    +++ linux-2.6/mm/filemap.h
    @@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iove
    const struct iovec *iov = *iovp;
    size_t base = *basep;

    - do {
    + while (bytes) {
    int copy = min(bytes, iov->iov_len - base);

    bytes -= copy;
    @@ -96,7 +96,7 @@ filemap_set_next_iovec(const struct iove
    iov++;
    base = 0;
    }
    - } while (bytes);
    + }
    *iovp = iov;
    *basep = base;
    }
    -
    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:2.428 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site