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 A84BAC3F68F for ; Tue, 10 Dec 2019 13:49:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6947120838 for ; Tue, 10 Dec 2019 13:49:33 +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="c0FEADOD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6947120838 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 DF7B66B2CA1; Tue, 10 Dec 2019 08:49:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D80D46B2CA2; Tue, 10 Dec 2019 08:49:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C48BA6B2CA3; Tue, 10 Dec 2019 08:49:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0029.hostedemail.com [216.40.44.29]) by kanga.kvack.org (Postfix) with ESMTP id AA2F26B2CA1 for ; Tue, 10 Dec 2019 08:49:32 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 543E7180AD820 for ; Tue, 10 Dec 2019 13:49:32 +0000 (UTC) X-FDA: 76249364184.02.snake90_70553b34a152b X-HE-Tag: snake90_70553b34a152b X-Filterd-Recvd-Size: 4285 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Dec 2019 13:49:31 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id n13so9104554pff.1 for ; Tue, 10 Dec 2019 05:49:31 -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=2GTyISog1VX8yYAJFI+c/tQ5PL+DROiS/ITcUOlh5Cs=; b=c0FEADODck6cpIJJgtjKYAmemgt9mpnPLYw9O4bu5TW3TNCwI8b5q6ij8BkpCd0nYy 6WxeFlUsOR7ofa8ZCWHs2hL8pJhGd7QjnStKiCJQkdx9MmdUCP2gGFzs4F8ZOLi1AUq1 XYKwagD4yz/ZaQSs00mW5W5UC8JxZU1zLoHRSeDLI20r60Mw+pFb95bJtmHUs87j3z6U 7vq+E8Gwe5pO9Zd2/h8+yHu/llz8RZR6RilV1lzKEupKwljmIfGEce8rCkKB5Zg3RVrw eXHGyM0pFtCiBBgQELyAUveIWL7Dc/o9mCkNnlBczw5Oejrclpe54hMvdzAAl5QZ6XTQ nJtA== 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=2GTyISog1VX8yYAJFI+c/tQ5PL+DROiS/ITcUOlh5Cs=; b=l3DPCcOlehoWwv4NLv8cpaqlHmNhby6WHYp3JWfolwykiLYxELzdy2Ra8orW6Bmy7z cib3Y+hYwi7YCXok2wXXAauGjKVjoIraWvp//E3YNrOLukY1FpJFusPJGw8wIBH2LKsm Z4hOEmyTEI+Wn9D8tgr3hGpprHjyzfL8NJZ8VeQ1ds+XSpG0Fd/GWVsLl5EN31f86Yyn T3c3G1zMPHWTuUw0mvx/pcvXblSKTT86+SLbFdOc/Bcv2vvbPnhZ+ZwCFlhnrVyPqDnC xS6sohISSeh69h3GDJbH36adUDPJQT9X6kNcEMFMMnCIAkeHhcxlQWKPaG2PQ0z+ddMc KZfg== X-Gm-Message-State: APjAAAWgFwIUxcHMM4RB/YDwE12x0KEzbPgiETFZhmE0ertMLrkRFbiA L0pVAmMBMp3eyR1FUObMivk= X-Google-Smtp-Source: APXvYqxoaZy5Ti1fGla4GQWKDnsoGwY+cdTdssY1GiH1lkSDhD5BlL6T7Wn5kwVpaMDI1nuvLkzdVA== X-Received: by 2002:a62:486:: with SMTP id 128mr35359892pfe.236.1575985770887; Tue, 10 Dec 2019 05:49:30 -0800 (PST) Received: from localhost.localdomain ([2408:8025:ad:7e20:84d1:c490:3936:fab0]) by smtp.gmail.com with ESMTPSA id t137sm3520602pgb.40.2019.12.10.05.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 05:49:30 -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 Subject: [PATCH] mm: cleanup some useless code Date: Tue, 10 Dec 2019 05:49:10 -0800 Message-Id: <20191210134911.2570-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 There is a duplicate PageTransHuge, because hpage_nr_pages have the same one. Signed-off-by: Kaitao Cheng --- 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