lkml.org 
[lkml]   [2011]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/14] drm/ttm: use shmem_read_mapping_page
    Soon tmpfs will stop supporting ->readpage and read_mapping_page():
    once "tmpfs: add shmem_read_mapping_page_gfp" has been applied,
    this patch can be applied to ease the transition.

    ttm_tt_swapin() and ttm_tt_swapout() use shmem_read_mapping_page()
    in place of read_mapping_page(), since their swap_space has been
    created with shmem_file_setup().

    Signed-off-by: Hugh Dickins <hughd@google.com>
    Cc: Thomas Hellstrom <thellstrom@vmware.com>
    Cc: Dave Airlie <airlied@redhat.com>
    ---
    drivers/gpu/drm/ttm/ttm_tt.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- linux.orig/drivers/gpu/drm/ttm/ttm_tt.c 2011-05-30 13:56:10.112796608 -0700
    +++ linux/drivers/gpu/drm/ttm/ttm_tt.c 2011-05-30 14:25:59.641670407 -0700
    @@ -484,7 +484,7 @@ static int ttm_tt_swapin(struct ttm_tt *
    swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;

    for (i = 0; i < ttm->num_pages; ++i) {
    - from_page = read_mapping_page(swap_space, i, NULL);
    + from_page = shmem_read_mapping_page(swap_space, i);
    if (IS_ERR(from_page)) {
    ret = PTR_ERR(from_page);
    goto out_err;
    @@ -557,7 +557,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, s
    from_page = ttm->pages[i];
    if (unlikely(from_page == NULL))
    continue;
    - to_page = read_mapping_page(swap_space, i, NULL);
    + to_page = shmem_read_mapping_page(swap_space, i);
    if (unlikely(IS_ERR(to_page))) {
    ret = PTR_ERR(to_page);
    goto out_err;

    \
     
     \ /
      Last update: 2011-05-31 02:45    [W:0.037 / U:0.344 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site