lkml.org 
[lkml]   [2017]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/7] mm:swap: remove end_swap_bio_write argument
    Date
    Every caller of __swap_writepage uses end_swap_bio_write as
    end_write_func argument so the argument is pointless.
    Remove it.

    Signed-off-by: Minchan Kim <minchan@kernel.org>
    ---
    include/linux/swap.h | 3 +--
    mm/page_io.c | 7 +++----
    mm/zswap.c | 2 +-
    3 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/include/linux/swap.h b/include/linux/swap.h
    index 76f1632eea5a..ae3da979a7b7 100644
    --- a/include/linux/swap.h
    +++ b/include/linux/swap.h
    @@ -336,8 +336,7 @@ extern void kswapd_stop(int nid);
    extern int swap_readpage(struct page *page, bool do_poll);
    extern int swap_writepage(struct page *page, struct writeback_control *wbc);
    extern void end_swap_bio_write(struct bio *bio);
    -extern int __swap_writepage(struct page *page, struct writeback_control *wbc,
    - bio_end_io_t end_write_func);
    +extern int __swap_writepage(struct page *page, struct writeback_control *wbc);
    extern int swap_set_page_dirty(struct page *page);

    int add_swap_extent(struct swap_info_struct *sis, unsigned long start_page,
    diff --git a/mm/page_io.c b/mm/page_io.c
    index 20139b90125a..3502a97f7c48 100644
    --- a/mm/page_io.c
    +++ b/mm/page_io.c
    @@ -254,7 +254,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
    end_page_writeback(page);
    goto out;
    }
    - ret = __swap_writepage(page, wbc, end_swap_bio_write);
    + ret = __swap_writepage(page, wbc);
    out:
    return ret;
    }
    @@ -273,8 +273,7 @@ static inline void count_swpout_vm_event(struct page *page)
    count_vm_events(PSWPOUT, hpage_nr_pages(page));
    }

    -int __swap_writepage(struct page *page, struct writeback_control *wbc,
    - bio_end_io_t end_write_func)
    +int __swap_writepage(struct page *page, struct writeback_control *wbc)
    {
    struct bio *bio;
    int ret;
    @@ -329,7 +328,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
    }

    ret = 0;
    - bio = get_swap_bio(GFP_NOIO, page, end_write_func);
    + bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
    if (bio == NULL) {
    set_page_dirty(page);
    unlock_page(page);
    diff --git a/mm/zswap.c b/mm/zswap.c
    index d39581a076c3..38db258515b5 100644
    --- a/mm/zswap.c
    +++ b/mm/zswap.c
    @@ -900,7 +900,7 @@ static int zswap_writeback_entry(struct zpool *pool, unsigned long handle)
    SetPageReclaim(page);

    /* start writeback */
    - __swap_writepage(page, &wbc, end_swap_bio_write);
    + __swap_writepage(page, &wbc);
    put_page(page);
    zswap_written_back_pages++;

    --
    2.7.4
    \
     
     \ /
      Last update: 2017-08-11 07:18    [W:3.113 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site