@@ -2323,13 +2323,13 @@ static void pofs_unpin(struct pages_or_folios *pofs)
2323
2323
/*
2324
2324
* Returns the number of collected folios. Return value is always >= 0.
2325
2325
*/
2326
- static unsigned long collect_longterm_unpinnable_folios (
2326
+ static void collect_longterm_unpinnable_folios (
2327
2327
struct list_head * movable_folio_list ,
2328
2328
struct pages_or_folios * pofs )
2329
2329
{
2330
- unsigned long i , collected = 0 ;
2331
2330
struct folio * prev_folio = NULL ;
2332
2331
bool drain_allow = true;
2332
+ unsigned long i ;
2333
2333
2334
2334
for (i = 0 ; i < pofs -> nr_entries ; i ++ ) {
2335
2335
struct folio * folio = pofs_get_folio (pofs , i );
@@ -2341,8 +2341,6 @@ static unsigned long collect_longterm_unpinnable_folios(
2341
2341
if (folio_is_longterm_pinnable (folio ))
2342
2342
continue ;
2343
2343
2344
- collected ++ ;
2345
-
2346
2344
if (folio_is_device_coherent (folio ))
2347
2345
continue ;
2348
2346
@@ -2364,8 +2362,6 @@ static unsigned long collect_longterm_unpinnable_folios(
2364
2362
NR_ISOLATED_ANON + folio_is_file_lru (folio ),
2365
2363
folio_nr_pages (folio ));
2366
2364
}
2367
-
2368
- return collected ;
2369
2365
}
2370
2366
2371
2367
/*
@@ -2442,11 +2438,9 @@ static long
2442
2438
check_and_migrate_movable_pages_or_folios (struct pages_or_folios * pofs )
2443
2439
{
2444
2440
LIST_HEAD (movable_folio_list );
2445
- unsigned long collected ;
2446
2441
2447
- collected = collect_longterm_unpinnable_folios (& movable_folio_list ,
2448
- pofs );
2449
- if (!collected )
2442
+ collect_longterm_unpinnable_folios (& movable_folio_list , pofs );
2443
+ if (list_empty (& movable_folio_list ))
2450
2444
return 0 ;
2451
2445
2452
2446
return migrate_longterm_unpinnable_folios (& movable_folio_list , pofs );
0 commit comments