From patchwork Thu Sep 16 19:30:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12500105 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 11AE2C433EF for ; Thu, 16 Sep 2021 19:30:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 841AB610E9 for ; Thu, 16 Sep 2021 19:30:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 841AB610E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 1B5B96B0071; Thu, 16 Sep 2021 15:30:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 165396B0072; Thu, 16 Sep 2021 15:30:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF9516B0073; Thu, 16 Sep 2021 15:30:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id E26836B0071 for ; Thu, 16 Sep 2021 15:30:21 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8F0D9183C7802 for ; Thu, 16 Sep 2021 19:30:21 +0000 (UTC) X-FDA: 78594427842.27.29A7A01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 3826570000B7 for ; Thu, 16 Sep 2021 19:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631820620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5D5yhincqgbc1iu/FJNR6o/naKwsnQ2+Q1T7O43eoLs=; b=OEKx2FCd5P0eVTi5XoEwK056dYzF+c6YfR0UWRfQn4uEsNkq+t4XUyy1kZLfjTc482smBZ GwGo7igv2SYlExgO8QXcKgmIbAQkOfpSD1jN8CQpZwoYMB/kDU3JeiLmJqvIquC00gIruU kkWbt2l/n2pYemtnOWuWtnecSXMMCbI= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-mHmZNLtjOaC13rU-VxpOJg-1; Thu, 16 Sep 2021 15:30:17 -0400 X-MC-Unique: mHmZNLtjOaC13rU-VxpOJg-1 Received: by mail-qv1-f72.google.com with SMTP id w13-20020a05621412ed00b0037cc26a5659so64056069qvv.1 for ; Thu, 16 Sep 2021 12:30:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5D5yhincqgbc1iu/FJNR6o/naKwsnQ2+Q1T7O43eoLs=; b=iK8Q5lgb3VGZr1QN0eMmX2z6nlnj5GVb7H3GcH1t3P0062d/aClWX9Bd55bx82WZQL aeKKtbrFS+GDCypptWKD9wu2AlxsuSx/mZzg+DgaL7mFwqdYPnOJF0jqJgg0ZAML6j4O rbfMhmz+SPuA9C/rgm7FjTcax118NZ2zzOoSBuvGKB9uknz9vhOD4ELzA6EdiWUQ72bI iH59g3RUquG/bocM1E94R0wBMxf6Nv84g8REsImrS8VCfjP+LdL3TaoW8HJrRdYIrqFC gInLlCPYyqaoUXFJRfibFxSlna3Hl7YMgkTiee6jyGdzVFj7uvWxiglG0NeX+7Xh0rCx ZbVw== X-Gm-Message-State: AOAM530gu3Kup7FMPJw780GxbyUgMwhsVrh5my7bn6l6CuAlHmgDaYA6 oFlgZULj8DNthTgCOBHRyQvaa+BlIHwXp+cL6dBnc5eYokiK91Y/byGsuuN2X3zAK3DHFZm5lDR x+h2LFfVUZ0E= X-Received: by 2002:a0c:b293:: with SMTP id r19mr6970242qve.19.1631820616977; Thu, 16 Sep 2021 12:30:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqeLKuf5ivkxMjhQDe53fj1yQG4lPZk//lUhSnJ6TsUY8EFOsN6hwpooVF5qeMEMdERo/8Ew== X-Received: by 2002:a0c:b293:: with SMTP id r19mr6970214qve.19.1631820616746; Thu, 16 Sep 2021 12:30:16 -0700 (PDT) Received: from t490s.redhat.com ([2607:fea8:56a2:9100::d35a]) by smtp.gmail.com with ESMTPSA id 90sm2731123qte.89.2021.09.16.12.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 12:30:16 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , peterx@redhat.com, Matthew Wilcox Subject: [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte() Date: Thu, 16 Sep 2021 15:30:14 -0400 Message-Id: <20210916193014.80129-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3826570000B7 X-Stat-Signature: p7cfxgi4hpgg4kgwpu3pmjpuoe8mg6q1 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OEKx2FCd; spf=none (imf27.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1631820621-642627 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: After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol", 2020-10-13) it's unused. Cc: Matthew Wilcox Signed-off-by: Peter Xu Reviewed-by: Muchun Song Reviewed-by: David Hildenbrand --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b762215d73eb..12fa08e216a6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5555,7 +5555,7 @@ static struct page *mc_handle_swap_pte(struct vm_area_struct *vma, #endif static struct page *mc_handle_file_pte(struct vm_area_struct *vma, - unsigned long addr, pte_t ptent, swp_entry_t *entry) + unsigned long addr, pte_t ptent) { if (!vma->vm_file) /* anonymous vma */ return NULL; @@ -5728,7 +5728,7 @@ static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma, else if (is_swap_pte(ptent)) page = mc_handle_swap_pte(vma, ptent, &ent); else if (pte_none(ptent)) - page = mc_handle_file_pte(vma, addr, ptent, &ent); + page = mc_handle_file_pte(vma, addr, ptent); if (!page && !ent.val) return ret;