Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2739108rdb; Mon, 4 Dec 2023 06:22:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDPPJ3sSRKYKsQ7l9NPQOPiw5wYqHomqG9i76sJ7g4Cfr2psP8C9fYHSLzkHWQOVFtxIOk X-Received: by 2002:a05:6a20:5490:b0:135:1af6:9a01 with SMTP id i16-20020a056a20549000b001351af69a01mr1513907pzk.8.1701699770895; Mon, 04 Dec 2023 06:22:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701699770; cv=none; d=google.com; s=arc-20160816; b=WmqK/XWfS7nGXfdRFjPn3uq7mIOY4Sud4Cn9g7QInis+GMtNwkfYX8i2/Hj451DYoF xOcUpgI9u5ruJ0z4pC/FEeScCZlRzuJXGwlU2MUidnee4cKz6VuF3a4ENArO5xK+blCM zu3MzdX2LY/dR2QJFImGUZYtT1KOxrXZk3EKNEtP3zuBdWwGDvsGOVLAjDTqQ6FNzib8 10OFwW1yZVZ9zuzEo8D0WHWLgzbEO7RxWk8Cv4Nr+kqYHM9jh+gkbxwMDt1bmJ9DT18d cZCFJDoALRMq3x5IRAWfS0jFJVo03Wr7CGBi0UE2pqbqPo6dxMJizgx68mVSp9rFhb/0 082w== 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=O9+7fynWu7ZwbI+2ouLA8wkNah+BDZS2kzyGsyNToAE=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=kP478TLyeChIo4+XzG5xMtoaNezkDf2fDT53ePEjBxDB9OJq7MuAS6gH84NidLZOHl QngS/r/ntKi+qtfBnQgxsnNP8Z9POlBS2Viiq4uHez/Q8fs6aOlen37YrohOuSXsa7jc jLhlMBfeBXcKFq6NaoUuWmBvYjLv1SISLPr8MwlT7ElC93KF1V0+RgMr3mSsXE0fWd8T Yg2q4VN6Pat4ZL9agGzfAAovLW2JaVi31Qtr70mqUn9e3Y1fRcAeePWo8vCfr0vKtg3I 6SH004dc6ZUynKFdnoBn9nlIWYalOfMbvqpY3Nrl/qSpht2POR0GYW70dOl3IHnGhCGu 1h3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="fNC1J8D/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a19-20020a056a000c9300b006ce51901fdfsi1754068pfv.310.2023.12.04.06.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:22:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="fNC1J8D/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 5BFC380A7E49; Mon, 4 Dec 2023 06:22:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235506AbjLDOWj (ORCPT + 99 others); Mon, 4 Dec 2023 09:22:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345241AbjLDOWU (ORCPT ); Mon, 4 Dec 2023 09:22:20 -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 830F611A for ; Mon, 4 Dec 2023 06:22:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699734; 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=O9+7fynWu7ZwbI+2ouLA8wkNah+BDZS2kzyGsyNToAE=; b=fNC1J8D/0iuCGNB1IqlYZ6TXf75nLxeC1QVgjBvLFcW+cTsbaBkGvKXsPMsUsa3sVW4l77 UpT65iKhAkfTyuyjAJYNMSxan4ZqAjRKMi4MHqFJhrnb4xd0RbL105RP4VR8+kQQedJLB/ xYpq3CAw0kCkB0NaBCXU6/z/0PC7TqE= 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-518-ekuHhhc4MEqvFS8uO4ctFw-1; Mon, 04 Dec 2023 09:22:11 -0500 X-MC-Unique: ekuHhhc4MEqvFS8uO4ctFw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 0E725811E7E; Mon, 4 Dec 2023 14:22:11 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 616822026D68; Mon, 4 Dec 2023 14:22:09 +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 RFC 12/39] mm/rmap: remove page_add_file_rmap() Date: Mon, 4 Dec 2023 15:21:19 +0100 Message-ID: <20231204142146.91437-13-david@redhat.com> In-Reply-To: <20231204142146.91437-1-david@redhat.com> References: <20231204142146.91437-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 04 Dec 2023 06:22:49 -0800 (PST) All users are gone, let's remove it. 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 a4a30c361ac50..95f7b94a70295 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -235,8 +235,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 *, unsigned int nr, struct vm_area_struct *); #define folio_add_file_rmap_pte(folio, page, vma) \ diff --git a/mm/rmap.c b/mm/rmap.c index 1614d98062948..53e2c653be99a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1422,27 +1422,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.41.0