Received: by 2002:a05:7412:a9a8:b0:f9:92ae:e617 with SMTP id o40csp24545rdh; Wed, 20 Dec 2023 14:49:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEGtjT+5h0AgwzoGjhWM32Vi278AgPxbe3dLbWnWh8LczDD5cTyDXtyXaFYTXO6OCc+2dPr X-Received: by 2002:a2e:9f4f:0:b0:2cc:671c:a44f with SMTP id v15-20020a2e9f4f000000b002cc671ca44fmr3366163ljk.33.1703112570434; Wed, 20 Dec 2023 14:49:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112570; cv=none; d=google.com; s=arc-20160816; b=PkEwPGh6WHl8nuphfTqO7aeaZ1F+0L+28RlK0h+sb3dU/la2S2bGjYmVfGHWkfLfa7 HWzZ4Td6CbrdO4SmGFJfLG4JnZ7ovLUimnL+riY6kfGwaDxwMXC7rYmSQDUoyXY1bLlu qkBsSHHKMtJKwC+QDpoY8hDVuJ3c12+MA7d/vSOERY99tl69yZWvFJtZ55m5mYLWCp4H glXaQMPlj9WU8MKhmGufruRiVJwa/P1zXIM0RzHa4czPdnVZsfv3qIJof2GT0gOSSEQ/ AKZUMdXmpP162A5qsqm1SVv27cErgfVXX7jKN0MOFDE6jjuGBoHBx/5MZ8RXkxIeQNxw iApg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=QIY4woM6QT5vXKPOcZRD72sCPk41egGwN4b1+ampIqs=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=uvea2VT1kPoUzjDOoo7ZnIlKNsatercER9sIvrUHc4ifFvTNCYzWTXswOWEcH9YqnF kqdvOfJFYYulPpdoyO3amqQv8hXhwHHgL96eqZsKUsN3aQm9RVG1z98TuxVK79xz87Ae SjQylVa+Eobnw5fZUUsoGf9vClV9SfYoKYTvcAh1rhlsp3rfq4o79f8Si9F/d/uZ1qng TYXAs522ztcW2uTKuow1yQL/WdxLJ3YqB9YL9UOTSWbptE3lBFo7TCGaF1Ly5hRGeoqI NMgO2CgZiLqAKqyepGAkVzOyekpELjPCrhfsODTDpHhIwNMl6KAEGnbIwE9o3yJKIIsE 8r/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q0ckCY9j; spf=pass (google.com: domain of linux-kernel+bounces-7543-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7543-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bl7-20020a056402210700b005537313708esi239792edb.689.2023.12.20.14.49.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:49:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7543-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q0ckCY9j; spf=pass (google.com: domain of linux-kernel+bounces-7543-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7543-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 2BD8E1F24383 for ; Wed, 20 Dec 2023 22:49:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C07B4EB22; Wed, 20 Dec 2023 22:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q0ckCY9j" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D1D14E628 for ; Wed, 20 Dec 2023 22:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112360; 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=QIY4woM6QT5vXKPOcZRD72sCPk41egGwN4b1+ampIqs=; b=Q0ckCY9jH/Rw7+VX7RBUOtlEq4bCoqocbGxcMwPXhjjv39OBeEF+cOqCdx9wgKCQlkVQPX pTF/4faRgU2hBET32FyhVTazWhKyEHZ9nwHKTvSnsvHdP7cYZpSOTdB6j8qwxvkjPDyms4 7MfIrETk/HBiucaA+28LSSCwbfIho1U= 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-340-u30R_eRpM7yzGggrf7qJug-1; Wed, 20 Dec 2023 17:45:58 -0500 X-MC-Unique: u30R_eRpM7yzGggrf7qJug-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 708A1848C02; Wed, 20 Dec 2023 22:45:57 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2EAC40C6EB9; Wed, 20 Dec 2023 22:45:54 +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 v2 19/40] mm/swapfile: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Wed, 20 Dec 2023 23:44:43 +0100 Message-ID: <20231220224504.646757-20-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Let's convert unuse_pte(). Signed-off-by: David Hildenbrand --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2f877ca445137..3eec686484ef5 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1806,7 +1806,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, if (pte_swp_exclusive(old_pte)) rmap_flags |= RMAP_EXCLUSIVE; - page_add_anon_rmap(page, vma, addr, rmap_flags); + folio_add_anon_rmap_pte(folio, page, vma, addr, rmap_flags); } else { /* ksm created a completely new copy */ folio_add_new_anon_rmap(folio, vma, addr); folio_add_lru_vma(folio, vma); -- 2.43.0