Received: by 2002:a05:7412:a9a8:b0:f9:92ae:e617 with SMTP id o40csp23979rdh; Wed, 20 Dec 2023 14:47:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBtODqz//MmOq1ddrO5bcGFGbLXrWIFxXif0UdYyK6X++k6lGDUSmSwgZrVpFz7huRrjUg X-Received: by 2002:a05:620a:4382:b0:77f:332:acac with SMTP id a2-20020a05620a438200b0077f0332acacmr26445414qkp.0.1703112462790; Wed, 20 Dec 2023 14:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112462; cv=none; d=google.com; s=arc-20160816; b=S18qskfzvgEnMMm9p/TCwox8DQGj53naRaLH/F7ZVD6UmieUu60qMAbbVf5on0uhmp zYvsjdL+mzPbNPhbXDYR97BjfWwLr7fjpHDaRV9JZKjy6ZE7CGvsOKqy4ZtEKlJ2ceHK kOF0Jy0um5ncUuJEu7W2+OmAeLwWWwdxpHsqI/H3lsO8OoWRPy5CSFatmxNEwR38d8ty EK2G+bU9c4ElHSP+ciclx0CdM+amf5LOPoaakXMNWQuRDwesN0YlIOQY6noURmiwnlZW aQxDivyIiiGJf5bArRNmF4xbMRuE3VLKwcSImhQFMVDl5ouhbg+YCjgA/xK0LwN7NfzY SOIg== 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=XIS0gsmH7QK9fc1k9Ch7Ppycbt3c49uXYdCQJR3Zfvw=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=xWxNppHauw3H8yfC+8HQM+Vr6bH07xcosD+p/FqnROaqGeBfAc941j1ZC307jKyOFb NDNx42OkgccAQptvoW1pSSnW4ZGcPE5TZAF0SUGUHL7++aI2E+pVDSkNXDIn/F6oINjT 6d0Za7i3oPWtiAVk1lQKEzI3nQ3gEzq0RKkfflcjBBsI7lEgjGB9OFSKM1rTVIGlQwHS Ofs5mxiGH4wzxb458QAKntOigrLvIQJAIK7nJfo+xhIwSEfEzNCNmbvzkW8oSpZLEU4W zGUd6MpR9rsbwXGZayrqIaBBnvla15/fp/8zw1nKgbrH5JNQAxJarwQAx5HUtCTT4SRT Vu8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZY38VdMe; spf=pass (google.com: domain of linux-kernel+bounces-7535-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7535-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id e12-20020a37ac0c000000b0077f0211c11csi729405qkm.588.2023.12.20.14.47.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:47:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7535-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZY38VdMe; spf=pass (google.com: domain of linux-kernel+bounces-7535-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7535-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 8AA881C23051 for ; Wed, 20 Dec 2023 22:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2A9974CDE5; Wed, 20 Dec 2023 22:45:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZY38VdMe" 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 F09C84CB40 for ; Wed, 20 Dec 2023 22:45:38 +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=1703112337; 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=XIS0gsmH7QK9fc1k9Ch7Ppycbt3c49uXYdCQJR3Zfvw=; b=ZY38VdMe4CXZh+jR+TVGUG53SnRTC6PimuGtrTk5BCu/olYe1hds4IDAwxzq+Dk5ElEtFG s5p/2nBjh/S64o0BhRB7+PADsYcZKslAn4DT1KJuQzwaW84Fx9fkFwsxAV7pbmy9f34jHj utd7xcnREAlfIpKvVzTxXxruo7U0gIA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-kA5itlGvPZq2AHOyuzUQEg-1; Wed, 20 Dec 2023 17:45:33 -0500 X-MC-Unique: kA5itlGvPZq2AHOyuzUQEg-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 6099A1C41B26; Wed, 20 Dec 2023 22:45:33 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0707240C6EB9; Wed, 20 Dec 2023 22:45:30 +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 10/40] mm/migrate: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Wed, 20 Dec 2023 23:44:34 +0100 Message-ID: <20231220224504.646757-11-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 remove_migration_pte(). Reviewed-by: Yin Fengwei Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index 0e912443a18c3..65d64a119cabb 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -262,7 +262,7 @@ static bool remove_migration_pte(struct folio *folio, page_add_anon_rmap(new, vma, pvmw.address, rmap_flags); else - page_add_file_rmap(new, vma, false); + folio_add_file_rmap_pte(folio, new, vma); set_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte); } if (vma->vm_flags & VM_LOCKED) -- 2.43.0