Received: by 10.192.165.148 with SMTP id m20csp1348328imm; Sat, 21 Apr 2018 06:37:14 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/RdKXaf8Uw1q4LUkbjmHNrRUjqpimSefFZEDk3TokKr+J04Q49FoEEBMDFcRWvUYLA4cTd X-Received: by 2002:a17:902:9006:: with SMTP id a6-v6mr13432053plp.375.1524317834760; Sat, 21 Apr 2018 06:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524317834; cv=none; d=google.com; s=arc-20160816; b=jtn6gYPDhpzvqyNC11MWumE83+Ar5uk8PoLaNW6LnOlEe5zp++x23RRb30djOl1meS INAvlxUsxiocAUjoETgl20FZMqN2O9vOu9Agedc5dwd13w0aU/kPxpfteDQo57tsrHQ9 a3EE9x5D2FKH70V+PLlD/OXDJLmBeLlo1V77O9D3cE7tg05Pu9OU8m0wheGbMZgivJBO EiL9odVmpUDHntFQNc732W5etTaq8WgUHBnjZacRiAIdltCoOmBHNS8y1UT4wW7SFN3q rJ6ZqLwJaPYDiUVh8mULM4yCs71068nyBVE7T/j7mrRJIy5yYcr8XZsNzlJUxWhAT9qF KwDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=Aw+5fQahs+EA+smG5D2HxTaOZNWMW8XaXRGpMB4tdmA=; b=Tmn5z3Ab7pNstAenNI4/JFycEbK3r751EkezPTSDngBsreoYDROA2ORau0tH7/SBra gYkT8lW8SdDn+nY/FhB2xpR5cF05v7SijHQTGGA3sL5cI/4H0C6PKFw9qxRu0bnzGPC9 LzLXgnbnsOT4i2h0PrLDnjCntn2xk1ONguTZsXJ0C342jM9n98Xjp9GDmM+18st1JUSE h/riUON9Jrb/evhBNS8abG5Q/IcShSKIdwtQYe5OVHoRUA82JVvzJ7WSzKBM52kdfk6i NrVdlFFhHFtQ8z4bEe8BfUijtabj9AJ5KKwFhhtb0Va2pOc5zrQTav3H8vJv7nqrBp4m gNGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meituan.com header.s=20130113 header.b=FEGUx1Ic; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=meituan.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r63si2553093pfj.331.2018.04.21.06.36.08; Sat, 21 Apr 2018 06:37:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@meituan.com header.s=20130113 header.b=FEGUx1Ic; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=meituan.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752769AbeDUNbk (ORCPT + 99 others); Sat, 21 Apr 2018 09:31:40 -0400 Received: from mx-fe5-210.meituan.com ([103.37.138.210]:49908 "EHLO mx02.meituan.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbeDUNbj (ORCPT ); Sat, 21 Apr 2018 09:31:39 -0400 Received: from localhost (localhost [127.0.0.1]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTP id BF16129748BB; Sat, 21 Apr 2018 21:31:33 +0800 (CST) Received: from mx02.meituan.com ([127.0.0.1]) by localhost (dx-it-mx02.dx.sankuai.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ndi_EiO5oMC1; Sat, 21 Apr 2018 21:31:33 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTP id 8A3A529747CD; Sat, 21 Apr 2018 21:31:33 +0800 (CST) DKIM-Filter: OpenDKIM Filter v2.9.2 dx-it-mx02.dx.sankuai.com 8A3A529747CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meituan.com; s=20130113; t=1524317493; bh=Aw+5fQahs+EA+smG5D2HxTaOZNWMW8XaXRGpMB4tdmA=; h=From:To:Subject:Date:Message-Id; b=FEGUx1IcnKB2SuT3yByZcMIL1ZU2Sry0cblcC+Ep7tQ7oxdtphZpWvPf6+omLhcoz L4X3L4lHXA2/Omxg9RaCztljWBSNAwOuVJRmAIM2umol3KvjKHsbEV+Od3AL9NfWcT 6Q3SX375CFtQVG74b8uSszF7sR7DAjS6/Xawp/z0= X-Virus-Scanned: amavisd-new at dx-it-mx02.dx.sankuai.com Received: from mx02.meituan.com ([127.0.0.1]) by localhost (dx-it-mx02.dx.sankuai.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fbVxMlIYavSM; Sat, 21 Apr 2018 21:31:33 +0800 (CST) Received: from gh-hulk-k8s-ep01.yf.sankuai.com (unknown [103.37.142.38]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTPA id 018652974920; Sat, 21 Apr 2018 21:29:46 +0800 (CST) From: Wang Long To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com Cc: aryabinin@virtuozzo.com, akpm@linux-foundation.org, wanglong19@meituan.com, khlebnikov@yandex-team.ru, xboe@kernel.dk, jack@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, gthelen@google.com, tj@kernel.org Subject: [PATCH] memcg: writeback: use memcg->cgwb_list directly Date: Sat, 21 Apr 2018 21:29:41 +0800 Message-Id: <1524317381-236318-1-git-send-email-wanglong19@meituan.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Wang Long --- include/linux/memcontrol.h | 1 - mm/backing-dev.c | 4 ++-- mm/memcontrol.c | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d99b71b..c0056e0 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1093,7 +1093,6 @@ static inline void dec_lruvec_page_state(struct page *page, #ifdef CONFIG_CGROUP_WRITEBACK -struct list_head *mem_cgroup_cgwb_list(struct mem_cgroup *memcg); struct wb_domain *mem_cgroup_wb_domain(struct bdi_writeback *wb); void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages, unsigned long *pheadroom, unsigned long *pdirty, diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 023190c..0a48e05 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -555,7 +555,7 @@ static int cgwb_create(struct backing_dev_info *bdi, memcg = mem_cgroup_from_css(memcg_css); blkcg_css = cgroup_get_e_css(memcg_css->cgroup, &io_cgrp_subsys); blkcg = css_to_blkcg(blkcg_css); - memcg_cgwb_list = mem_cgroup_cgwb_list(memcg); + memcg_cgwb_list = &memcg->cgwb_list; blkcg_cgwb_list = &blkcg->cgwb_list; /* look up again under lock and discard on blkcg mismatch */ @@ -734,7 +734,7 @@ static void cgwb_bdi_unregister(struct backing_dev_info *bdi) */ void wb_memcg_offline(struct mem_cgroup *memcg) { - struct list_head *memcg_cgwb_list = mem_cgroup_cgwb_list(memcg); + struct list_head *memcg_cgwb_list = &memcg->cgwb_list; struct bdi_writeback *wb, *next; spin_lock_irq(&cgwb_lock); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e074f7c..d1adb9c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3562,11 +3562,6 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, #ifdef CONFIG_CGROUP_WRITEBACK -struct list_head *mem_cgroup_cgwb_list(struct mem_cgroup *memcg) -{ - return &memcg->cgwb_list; -} - static int memcg_wb_domain_init(struct mem_cgroup *memcg, gfp_t gfp) { return wb_domain_init(&memcg->cgwb_domain, gfp); -- 1.8.3.1