Received-SPF: pass (google.com: domain of linux-kernel+bounces-65929-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 2/2] mm/migrate_device: further convert migrate_device_finalize() to folios
Date: Wed, 14 Feb 2024 12:20:55 -0800
Message-ID: <20240214202055.77776-2-sidhartha.kumar@oracle.com>
In-Reply-To: <20240214202055.77776-1-sidhartha.kumar@oracle.com>
References: <20240214202055.77776-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?8xmtHZmiuegvOYGHs7o4QeDJr290jK99KoA5aVs6Qe/8mFXX8wkz0S1k5DnR?=
 =?us-ascii?Q?IR979Tm5uddvXcHAZ//1ZhCxDrSqA2iOjeNZqj6ZqTgIJZ8Bai4Foo9Q3sOU?=
 =?us-ascii?Q?5KuzlQ4Am+goU8S1KwfP86zXzgoiFfuNCSOS7EissjWfE3AfB9nzPgxnjH2e?=
 =?us-ascii?Q?VODTBSEKGyYxvqJTtl7W+XvdNFOUDiQ94Ihie6j376Ktcln6RAAtmQZY40Po?=
 =?us-ascii?Q?YvcIG7LVSe9++zxcZGpp7F/lmdZGnRCGejfEVI70g6XnTvGn9KDJm3ZlBIU9?=
 =?us-ascii?Q?x76hWVfRqjBo1QWhGDord6efxYz5TsBO5KMz79Vei8T41BceziKlvRjOhEj8?=
 =?us-ascii?Q?EbZ9ndPOUsAug26JzKJKDqkUYwM5g1akFU9Ht2gBGhDzDzbqt4w7rQ95Ikjr?=
 =?us-ascii?Q?gOTYJ1MQxnqtE7Xyh0iI5rfgpJfKbpuI6/YxFtCuDpOBZ2bzmmiP2x5Dvy+B?=
 =?us-ascii?Q?Gq2p6qlFJlQGzimXVxFI5VzLlUBBZwUKibhci+qjr9lODnCa+mb3FTwS3Vew?=
 =?us-ascii?Q?vJueYUQNKJwdzpCRuYo6GQLdkPpzB80yoyQlB/6tSkP69AgudOdNtgFtMmES?=
 =?us-ascii?Q?Wcwott5I2mAp1Hziwr/jw02ojZMBMYbQFJ7jJOrZF6iBUlta/upvPQ3CXMor?=
 =?us-ascii?Q?JstBcPhfj6MQcdUniXfZGMcW2O/kWEL13LT/Re/yeT3pWWtVBCvOlZsvv/Xk?=
 =?us-ascii?Q?ufE+k4A8m2y9sJdELOXtLvOhlv4O1L2x7VrhY05K6vMVhG8zbfp4yQT2GkmM?=
 =?us-ascii?Q?/5+LSuNWBjMK7vIJ2gniGIKaRfsmEH/33763lbqrtK25p3D0emUAvBazLInu?=
 =?us-ascii?Q?fh5P1tIU7L/gOvGnKBAjLEw3bGGLX9B09Pv6eprriVcC+4kk2e24+o9UNi9i?=
 =?us-ascii?Q?xsoWRJi4wdPQy8CXm5MngEzftf3ZMo6P/rbnhEN4Uzvq37gyhEE3ElnjrJch?=
 =?us-ascii?Q?khRgphU8pPsI92arB4TtNFIl09LDgSS4AZEiDhwKakNTIMuK6Zt8cX4tcB5z?=
 =?us-ascii?Q?EfV4G2YoIP58F9mhrJDlBSJwPwtOFRizRoAk7eBNJIdFX8zjP235Bg+NpxAS?=
 =?us-ascii?Q?W1ymv5TQ/LFhXRkSig9bN8eOhhoYufCwZhR/7NcDXVYsTxE1UZ3JVPlXy8C7?=
 =?us-ascii?Q?aXtmgHBU0Xotn15mkzyHJRJYlHPLf1//XL1ZF+vxNCW4WNlktWtyaAtjMoz+?=
 =?us-ascii?Q?05WZpIGAgPOr3rjpk+ACOMyGxktmHsrYRbeYUiLcvJft2OG/QhkoyhUTHG1J?=
 =?us-ascii?Q?vedm4NdVOSKyBOPpW2kwxgPxhLF2vFwSuuaTiL7unkkuKdc/V9aJScnn1AEl?=
 =?us-ascii?Q?s4wZ8O7OerNZO0BKVqylc2xAjA7gHfDAtDZuNNY4qGwYRknNyprRYMaNstwC?=
 =?us-ascii?Q?Bd8xGwZFEjnnaZLILsYx0Z1zSZ5V8CRX2C5hCNUz4iPnU+dU27rIBMXRVvKH?=
 =?us-ascii?Q?RID5cNrpKKDZoFlgVp2N4BfqHmFpnhI2OubbPZWwDzYeRIcsUp26wuqc4aux?=
 =?us-ascii?Q?3mAvN6XVeo3JRTrWDLkVliWVsJXcVfNB9Qw9lb8TAvpcYYBKTLQeIqsj4ElS?=
 =?us-ascii?Q?h+ZC2Uy+RIlRNuH3yDJ3/8WF79CEbKw6UnNwEKqWb7IxHTGZr/CZCii+gMkM?=
 =?us-ascii?Q?xROwxNmIwjpjVXdVupZl1xw=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	ohJfnhkrU62SP/RxJWuaUYptuEGvDEbctnIUNgB3md56BSZKlU7vpo2frShylcUHZdWFy0DCSFO1f+GpcZkdB8Br74IlilEspP/ZULauMzdg86GOnpVbDpnyKs3gNVOc+6FrtcAGQvWV+GOoGZODTstXp46Q9Ebvg6mm05/WBqW3blRNjdnWuch9+gW/dAyeT1vGkkpKcGLmMVf3Uml+THwXUFC0I5yV6ClceJWelM9iFwIJD9BZq9IRQffVghmvGMeobjcTDHfS/Jnt1AKrKbBp6/JQ3gUl/FEkH+L2tz6JyEN8ISGrl5fUpS6U95r+zp3X8tmun1droy+CZ17TeAbJ2xeix1gY4BDn8Hd/TA0lFVuZp8Nb+0Yp8jeQ5fHV+Zpg+FOHSz5duKa129f50/MQfsGkMZns88Mt0Y3szxr7jjVkMYi6bkkCHu0W1mq6e0Pntw3vu3wsy7xiJkcdY4hrQ6Po6wJcHOPMNNG7ge+0CXEYaO5jxKtR69nFZZqxr4YvqK1TrMnmhHzUWKIGAetXLO/ToNvrz0nugESXmkTQ54nEkBmK1xIN46CB93afm/B2VGH+m9HrnENkgWUdue4IfIINgCL8p4MrOGYwUOQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 51ffefb8-fc62-4b58-e20a-08dc2d9a7a98
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 20:21:08.6300
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: w36gnoaDwbHJsddA+JrTA/thpkRW06eMqRNq+iKvccVnq47rShAC10OmuulkHXdQuAJvkxwYIzw521nHK1+NIyRaeJ1iZ2Ix+2YSy1eMBlk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7963
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-14_12,2024-02-14_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 phishscore=0 mlxscore=0 suspectscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402140159
X-Proofpoint-GUID: WnhuTZoa1qEdd2B6gmfTbp4hOTmsN-OP
X-Proofpoint-ORIG-GUID: WnhuTZoa1qEdd2B6gmfTbp4hOTmsN-OP

Use folio api functions from the already defined src and dst folio
variables.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/migrate_device.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 9152a329b0a68..a48d5cdb28553 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -843,17 +843,17 @@ void migrate_device_finalize(unsigned long *src_pfns,
 		remove_migration_ptes(src, dst, false);
 		folio_unlock(src);
 
-		if (is_zone_device_page(page))
-			put_page(page);
+		if (folio_is_zone_device(src))
+			folio_put(src);
 		else
-			putback_lru_page(page);
+			folio_putback_lru(src);
 
 		if (newpage != page) {
-			unlock_page(newpage);
-			if (is_zone_device_page(newpage))
-				put_page(newpage);
+			folio_unlock(dst);
+			if (folio_is_zone_device(dst))
+				folio_put(dst);
 			else
-				putback_lru_page(newpage);
+				folio_putback_lru(dst);
 		}
 	}
 }
-- 
2.42.0