Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4064675rdb; Mon, 11 Dec 2023 07:58:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkr4GSLXAgQPV1wZYnsZmA8503GUoz8umrxWoy2Yuui8EFefXJd9hfBGiWKEhrIln4vZJL X-Received: by 2002:a05:6a00:1909:b0:6ce:8387:e4dd with SMTP id y9-20020a056a00190900b006ce8387e4ddmr2749786pfi.32.1702310284088; Mon, 11 Dec 2023 07:58:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310284; cv=none; d=google.com; s=arc-20160816; b=hE5JxDc/d6WHuFaxffKPe9aVe2lGIk2YTm66fXGQ4DVT/yvzPzeNMBipMWq6WyYuGj prPfS306YA1Ucz3g5a/PYwhCIt5bI1ELv4KGqjLc7cKAZxjHGtN8U0a6US9eyqSTijY7 dtE2Ef6VAg1LgcFVK0IIkv6IIIZmkMgyzPgt7C/0GiG0y5cj3mfsleG9ifcrcMttzHWT XNiZ2jnC59JFHa9BMKKgGhlbKiy3coyFy5fcUV1WnmKpxlX1CpKu5n7IAcl0ydCc4Ex9 rKbbIHW6bPNiC0FhgDWwq5F8Nt54NFusxHdmls1DLp4i4d/ex4putBl3hC/LttfVXMGg S7Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DP/TBY2FfVhMMZMh3t2xGvG39Fvp3GsRcAEgonPxhwA=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=AGxYaPIkt8Qj6NNZ4TnZDpx317XxMv7m9wNwMrMJsWwkWcjmnoYwE8IL5Q+YD78JFc 9vE0Jr5ljLvheL9CuWVBRXSGIk0oQcDPIncejEEKVO8/fQ2cn4k+gOUB90i1bkokLLEx YU/QTRC3kZspdGaQ2pmQIC9DH60bdL+h8VgEcGcT4i7NrTg8CSf+YPikrJXVsuoN4XKd XRimk+xVyHrHYZYlf1vFsrFTgGvbmfzrrY1N6ouFDUifHL38B3lPaHG/QJeyKjGbUHFO vyJVYoBGBZyjjf2gsgC8ck3Ij3j+6ExkfSZyH8zKiUzIityZmrACscaGyefxyZwN8vYO vn1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Xzn5cTat; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id c37-20020a634e25000000b005c645e1ff20si6098468pgb.73.2023.12.11.07.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:58:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Xzn5cTat; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id EF22D803DB37; Mon, 11 Dec 2023 07:57:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344528AbjLKP5m (ORCPT + 99 others); Mon, 11 Dec 2023 10:57:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344509AbjLKP50 (ORCPT ); Mon, 11 Dec 2023 10:57:26 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3863110A for ; Mon, 11 Dec 2023 07:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DP/TBY2FfVhMMZMh3t2xGvG39Fvp3GsRcAEgonPxhwA=; b=Xzn5cTat5p+eejld5q+0GDwHOrr1gaA5SJeWrbTL0izXJqSM4fcSiUhswhyJtNb3nq3d7r bhYV4e5N50AUhiGZJyVAzlSjDq4l9i5Fbjxl4VobvYJRjCNaHHJ1ETQKJJmSyffs0MMlbf AAh2EEsbz+zkSodsG/NoPZ708vNxq1A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-nYAYGRlYOBO4fpab-9MmDA-1; Mon, 11 Dec 2023 10:57:27 -0500 X-MC-Unique: nYAYGRlYOBO4fpab-9MmDA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7362810133A0; Mon, 11 Dec 2023 15:57:26 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9447E1121306; Mon, 11 Dec 2023 15:57:24 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v1 12/39] mm/rmap: remove page_add_file_rmap() Date: Mon, 11 Dec 2023 16:56:25 +0100 Message-ID: <20231211155652.131054-13-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 11 Dec 2023 07:57:59 -0800 (PST) All users are gone, let's remove it. Reviewed-by: Yin Fengwei Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 2 -- mm/rmap.c | 21 --------------------- 2 files changed, 23 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 1753900f4aed..7198905dc8be 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -240,8 +240,6 @@ void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address); void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); -void page_add_file_rmap(struct page *, struct vm_area_struct *, - bool compound); void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages, struct vm_area_struct *); #define folio_add_file_rmap_pte(folio, page, vma) \ diff --git a/mm/rmap.c b/mm/rmap.c index 4f30930a1162..2ff2f11275e5 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1467,27 +1467,6 @@ void folio_add_file_rmap_pmd(struct folio *folio, struct page *page, #endif } -/** - * page_add_file_rmap - add pte mapping to a file page - * @page: the page to add the mapping to - * @vma: the vm area in which the mapping is added - * @compound: charge the page as compound or small page - * - * The caller needs to hold the pte lock. - */ -void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, - bool compound) -{ - struct folio *folio = page_folio(page); - - VM_WARN_ON_ONCE_PAGE(compound && !PageTransHuge(page), page); - - if (likely(!compound)) - folio_add_file_rmap_pte(folio, page, vma); - else - folio_add_file_rmap_pmd(folio, page, vma); -} - /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from -- 2.43.0