lkml.org 
[lkml]   [2007]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[14/36] Use page_cache_xxx in fs/splice.c
    Use page_cache_xxx in fs/splice.c

    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    ---
    fs/splice.c | 27 ++++++++++++++-------------
    1 files changed, 14 insertions(+), 13 deletions(-)

    diff --git a/fs/splice.c b/fs/splice.c
    index c010a72..7910f32 100644
    --- a/fs/splice.c
    +++ b/fs/splice.c
    @@ -279,9 +279,9 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
    .ops = &page_cache_pipe_buf_ops,
    };

    - index = *ppos >> PAGE_CACHE_SHIFT;
    - loff = *ppos & ~PAGE_CACHE_MASK;
    - req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
    + index = page_cache_index(mapping, *ppos);
    + loff = page_cache_offset(mapping, *ppos);
    + req_pages = page_cache_next(mapping, len + loff);
    nr_pages = min(req_pages, (unsigned)PIPE_BUFFERS);

    /*
    @@ -336,7 +336,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
    * Now loop over the map and see if we need to start IO on any
    * pages, fill in the partial map, etc.
    */
    - index = *ppos >> PAGE_CACHE_SHIFT;
    + index = page_cache_index(mapping, *ppos);
    nr_pages = spd.nr_pages;
    spd.nr_pages = 0;
    for (page_nr = 0; page_nr < nr_pages; page_nr++) {
    @@ -348,7 +348,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
    /*
    * this_len is the max we'll use from this page
    */
    - this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);
    + this_len = min_t(unsigned long, len,
    + page_cache_size(mapping) - loff);
    page = pages[page_nr];

    if (PageReadahead(page))
    @@ -408,7 +409,7 @@ fill_it:
    * i_size must be checked after PageUptodate.
    */
    isize = i_size_read(mapping->host);
    - end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
    + end_index = page_cache_index(mapping, isize - 1);
    if (unlikely(!isize || index > end_index))
    break;

    @@ -422,7 +423,7 @@ fill_it:
    /*
    * max good bytes in this page
    */
    - plen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1;
    + plen = page_cache_offset(mapping, isize - 1) + 1;
    if (plen <= loff)
    break;

    @@ -573,12 +574,12 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
    if (unlikely(ret))
    return ret;

    - index = sd->pos >> PAGE_CACHE_SHIFT;
    - offset = sd->pos & ~PAGE_CACHE_MASK;
    + index = page_cache_index(mapping, sd->pos);
    + offset = page_cache_offset(mapping, sd->pos);

    this_len = sd->len;
    - if (this_len + offset > PAGE_CACHE_SIZE)
    - this_len = PAGE_CACHE_SIZE - offset;
    + if (this_len + offset > page_cache_size(mapping))
    + this_len = page_cache_size(mapping) - offset;

    find_page:
    page = find_lock_page(mapping, index);
    @@ -839,7 +840,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out,
    unsigned long nr_pages;

    *ppos += ret;
    - nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
    + nr_pages = page_cache_next(mapping, ret);

    /*
    * If file or inode is SYNC and we actually wrote some data,
    @@ -896,7 +897,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
    unsigned long nr_pages;

    *ppos += ret;
    - nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
    + nr_pages = page_cache_next(mapping, ret);

    /*
    * If file or inode is SYNC and we actually wrote some data,
    --
    1.5.2.4
    --
    -
    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-08-28 21:17    [W:0.025 / U:300.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site