lkml.org 
[lkml]   [2011]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 5/6] Good bye remove_from_page_cache
    Date
    Now delete_from_page_cache replaces remove_from_page_cache.
    So we remove remove_from_page_cache so fs or something out of
    mainline will notice it when compile time and can fix it.

    Cc: Christoph Hellwig <hch@infradead.org>
    Acked-by: Hugh Dickins <hughd@google.com>
    Acked-by: Mel Gorman <mel@csn.ul.ie>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
    ---
    include/linux/pagemap.h | 1 -
    mm/filemap.c | 26 ++++++++++----------------
    2 files changed, 10 insertions(+), 17 deletions(-)

    diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
    index a943985..631b1b6 100644
    --- a/include/linux/pagemap.h
    +++ b/include/linux/pagemap.h
    @@ -455,7 +455,6 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping,
    pgoff_t index, gfp_t gfp_mask);
    int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
    pgoff_t index, gfp_t gfp_mask);
    -extern void remove_from_page_cache(struct page *page);
    extern void __remove_from_page_cache(struct page *page);
    extern void delete_from_page_cache(struct page *page);
    int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);
    diff --git a/mm/filemap.c b/mm/filemap.c
    index f056d0c..5f3a389 100644
    --- a/mm/filemap.c
    +++ b/mm/filemap.c
    @@ -148,7 +148,16 @@ void __remove_from_page_cache(struct page *page)
    }
    }

    -void remove_from_page_cache(struct page *page)
    +/**
    + * delete_from_page_cache - delete page from page cache
    + * @page: the page which the kernel is trying to remove from page cache
    + *
    + * This must be called only on pages that have
    + * been verified to be in the page cache and locked.
    + * It will never put the page into the free list,
    + * the caller has a reference on the page.
    + */
    +void delete_from_page_cache(struct page *page)
    {
    struct address_space *mapping = page->mapping;
    void (*freepage)(struct page *);
    @@ -163,21 +172,6 @@ void remove_from_page_cache(struct page *page)

    if (freepage)
    freepage(page);
    -}
    -EXPORT_SYMBOL(remove_from_page_cache);
    -
    -/**
    - * delete_from_page_cache - delete page from page cache
    - * @page: the page which the kernel is trying to remove from page cache
    - *
    - * This must be called only on pages that have
    - * been verified to be in the page cache and locked.
    - * It will never put the page into the free list,
    - * the caller has a reference on the page.
    - */
    -void delete_from_page_cache(struct page *page)
    -{
    - remove_from_page_cache(page);
    page_cache_release(page);
    }
    EXPORT_SYMBOL(delete_from_page_cache);
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-02-06 11:53    [W:0.025 / U:0.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site