From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7288FC00454 for ; Tue, 10 Dec 2019 16:05:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 37321207FF for ; Tue, 10 Dec 2019 16:05:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eny3JXx2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37321207FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AD1F76B2D20; Tue, 10 Dec 2019 11:05:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A81FB6B2D21; Tue, 10 Dec 2019 11:05:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 971C16B2D22; Tue, 10 Dec 2019 11:05:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0146.hostedemail.com [216.40.44.146]) by kanga.kvack.org (Postfix) with ESMTP id 80C096B2D20 for ; Tue, 10 Dec 2019 11:05:13 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id D67A6BA16 for ; Tue, 10 Dec 2019 16:05:12 +0000 (UTC) X-FDA: 76249706064.24.bait25_84b11d5c0865c X-HE-Tag: bait25_84b11d5c0865c X-Filterd-Recvd-Size: 4700 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Dec 2019 16:05:11 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id q8so63874pfh.7 for ; Tue, 10 Dec 2019 08:05:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=emGhzWuhNPjt1BJOm+vTsDQa4JuHnONtolq4L0YAYQ8=; b=eny3JXx2eahzZo3X31J0NB5EmLHKTOLzfIfOxR4z3ENiB1Iof+3JuFqpyvxRWvP4Pu fTylmtLSdoRXhWcJpw6qqXHQo3alRswnSIpp0AnOv6CzOgaxFODrXQWyIjvEwZEsrIB4 WmCMT9eiUFYON+w7Ci5J22Zo5o+uMk5PDckFgxqAaEocNlmYdSm8fZHFeXRis1P+lrjQ DqGC8eVJXFytcZFNdUpWzOD/tLgWw6HWuFcaFbjO9acQjWg38quHgp5HUFwE8mHGKjGD RGaVQeqzNVgpLerJQ23QVALPzOL8cZStwWdXtH73Rnb56gTLJRufPy1w7SjKlZJuPiBb dXhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=emGhzWuhNPjt1BJOm+vTsDQa4JuHnONtolq4L0YAYQ8=; b=qMoaixO5t3UGGIXpxW67q71wC3DDGxPv83sebjLZNyznoGJZQMY87mE0mgSXoS2K+q 5NVeN4Z2v2cQbqYsP5CTwqmvEPQV3ZdygEjq17K10i4O3H1ZtI2SBi03GEtJywYBygEJ 0JF+kJIK/H3KSwGClI19C50QBIFpX37IVclO5oddbdnhTVZOfnJNHRo5aM/WZl3M2nY7 Alk8P9efobllKBGA4UEBfQw/VGOlPKFEmzymFtxFCJCdiz1QfPsZv3XDvkEx9NP1GfJ4 LTgeJdAVwFQfGWjmjG7OFZX4ckvBsRYSj8V8jlERhwujJvWbsUxpBv3PQexRgzQKs4Qf AKHw== X-Gm-Message-State: APjAAAUeZfDlxFZu+Q8SaxkORDVTE3jN/07PBQ3+5rezT9Lflh9GVg8h wX3brjipu/y3HksVguu5rzM= X-Google-Smtp-Source: APXvYqxqyq0LMYrV9nWAMsGfNdVghMRXYcYTjVV4noJRT3W6Qq8Yvutu7S2XNRZVC7YP4a6pWJ2vGw== X-Received: by 2002:a63:d406:: with SMTP id a6mr25684793pgh.264.1575993910580; Tue, 10 Dec 2019 08:05:10 -0800 (PST) Received: from localhost.localdomain ([2408:8025:ad:7e20:84d1:c490:3936:fab0]) by smtp.gmail.com with ESMTPSA id c68sm4022729pfc.156.2019.12.10.08.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 08:05:10 -0800 (PST) From: chengkaitao To: hannes@cmpxchg.org Cc: mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, smuchun@gmail.com, Kaitao Cheng , Michal Hocko Subject: [PATCH v2] mm: cleanup some useless code Date: Tue, 10 Dec 2019 08:04:50 -0800 Message-Id: <20191210160450.3395-1-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Kaitao Cheng Compound pages handling in mem_cgroup_migrate is more convoluted than necessary. The state is duplicated in compound variable and the same could be achieved by PageTransHuge check which is trivial and hpage_nr_pages is already PageTransHuge aware. It is much simpler to just use hpage_nr_pages for nr_pages and replace the local variable by PageTransHuge check directly Signed-off-by: Kaitao Cheng Acked-by: Michal Hocko --- Change in v2: Update commit message mm/memcontrol.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index bc01423277c5..870284d3ee9d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6678,7 +6678,6 @@ void mem_cgroup_migrate(struct page *oldpage, struc= t page *newpage) { struct mem_cgroup *memcg; unsigned int nr_pages; - bool compound; unsigned long flags; =20 VM_BUG_ON_PAGE(!PageLocked(oldpage), oldpage); @@ -6700,8 +6699,7 @@ void mem_cgroup_migrate(struct page *oldpage, struc= t page *newpage) return; =20 /* Force-charge the new page. The old one will be freed soon */ - compound =3D PageTransHuge(newpage); - nr_pages =3D compound ? hpage_nr_pages(newpage) : 1; + nr_pages =3D hpage_nr_pages(newpage); =20 page_counter_charge(&memcg->memory, nr_pages); if (do_memsw_account()) @@ -6711,7 +6709,8 @@ void mem_cgroup_migrate(struct page *oldpage, struc= t page *newpage) commit_charge(newpage, memcg, false); =20 local_irq_save(flags); - mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); + mem_cgroup_charge_statistics(memcg, newpage, PageTransHuge(newpage), + nr_pages); memcg_check_events(memcg, newpage); local_irq_restore(flags); } --=20 2.20.1