lkml.org 
[lkml]   [2008]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH -mmotm 2/4] memcg: remove mem_cgroup_try_charge
    Now, mem_cgroup_try_charge is not used by anyone, so we can remove it.

    Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    ---
    include/linux/memcontrol.h | 8 --------
    mm/memcontrol.c | 21 +--------------------
    2 files changed, 1 insertions(+), 28 deletions(-)

    diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
    index fe82b58..4b35739 100644
    --- a/include/linux/memcontrol.h
    +++ b/include/linux/memcontrol.h
    @@ -40,8 +40,6 @@ struct mm_struct;
    extern int mem_cgroup_newpage_charge(struct page *page, struct mm_struct *mm,
    gfp_t gfp_mask);
    /* for swap handling */
    -extern int mem_cgroup_try_charge(struct mm_struct *mm,
    - gfp_t gfp_mask, struct mem_cgroup **ptr);
    extern int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
    struct page *page, gfp_t mask, struct mem_cgroup **ptr);
    extern void mem_cgroup_commit_charge_swapin(struct page *page,
    @@ -135,12 +133,6 @@ static inline int mem_cgroup_cache_charge(struct page *page,
    return 0;
    }

    -static inline int mem_cgroup_try_charge(struct mm_struct *mm,
    - gfp_t gfp_mask, struct mem_cgroup **ptr)
    -{
    - return 0;
    -}
    -
    static inline int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
    struct page *page, gfp_t gfp_mask, struct mem_cgroup **ptr)
    {
    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 50ee1be..9c5856b 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -808,27 +808,8 @@ nomem:
    return -ENOMEM;
    }

    -/**
    - * mem_cgroup_try_charge - get charge of PAGE_SIZE.
    - * @mm: an mm_struct which is charged against. (when *memcg is NULL)
    - * @gfp_mask: gfp_mask for reclaim.
    - * @memcg: a pointer to memory cgroup which is charged against.
    - *
    - * charge against memory cgroup pointed by *memcg. if *memcg == NULL, estimated
    - * memory cgroup from @mm is got and stored in *memcg.
    - *
    - * Returns 0 if success. -ENOMEM at failure.
    - * This call can invoke OOM-Killer.
    - */
    -
    -int mem_cgroup_try_charge(struct mm_struct *mm,
    - gfp_t mask, struct mem_cgroup **memcg)
    -{
    - return __mem_cgroup_try_charge(mm, mask, memcg, true);
    -}
    -
    /*
    - * commit a charge got by mem_cgroup_try_charge() and makes page_cgroup to be
    + * commit a charge got by __mem_cgroup_try_charge() and makes page_cgroup to be
    * USED state. If already USED, uncharge and return.
    */


    \
     
     \ /
      Last update: 2008-12-05 13:35    [W:0.025 / U:89.516 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site