From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754852Ab1K2Kwu (ORCPT ); Tue, 29 Nov 2011 05:52:50 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:54516 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754631Ab1K2Kwp (ORCPT ); Tue, 29 Nov 2011 05:52:45 -0500 From: Johannes Weiner To: Andrew Morton Cc: KAMEZAWA Hiroyuki , Michal Hocko , Balbir Singh , David Rientjes , Hugh Dickins , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch 7/7] mm: memcg: remove unneeded checks from uncharge_page() Date: Tue, 29 Nov 2011 11:52:05 +0100 Message-Id: <1322563925-1667-8-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1322563925-1667-1-git-send-email-hannes@cmpxchg.org> References: <1322563925-1667-1-git-send-email-hannes@cmpxchg.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Weiner mem_cgroup_uncharge_page() is only called on either freshly allocated pages without page->mapping or on rmapped PageAnon() pages. There is no need to check for a page->mapping that is not an anon_vma. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Acked-by: Michal Hocko --- mm/memcontrol.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f5aa1b8..468a5a4 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2992,8 +2992,7 @@ void mem_cgroup_uncharge_page(struct page *page) /* early check. */ if (page_mapped(page)) return; - if (page->mapping && !PageAnon(page)) - return; + VM_BUG_ON(page->mapping && !PageAnon(page)); __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_MAPPED); } -- 1.7.6.4