Skip to content

Commit 1963de7

Browse files
axboeakpm00
authored andcommitted
mm/readahead: add folio allocation helper
Just a wrapper around filemap_alloc_folio() for now, but add it in preparation for modifying the folio based on the 'ractl' being passed in. No functional changes in this patch. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Reviewed-by: Kirill A. Shutemov <[email protected]> Reviewed-by: Matthew Wilcox (Oracle) <[email protected]> Cc: Brian Foster <[email protected]> Cc: Chris Mason <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Johannes Weiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent f598cda commit 1963de7

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

mm/readahead.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,12 @@ static void read_pages(struct readahead_control *rac)
178178
BUG_ON(readahead_count(rac));
179179
}
180180

181+
static struct folio *ractl_alloc_folio(struct readahead_control *ractl,
182+
gfp_t gfp_mask, unsigned int order)
183+
{
184+
return filemap_alloc_folio(gfp_mask, order);
185+
}
186+
181187
/**
182188
* page_cache_ra_unbounded - Start unchecked readahead.
183189
* @ractl: Readahead control.
@@ -255,8 +261,8 @@ void page_cache_ra_unbounded(struct readahead_control *ractl,
255261
continue;
256262
}
257263

258-
folio = filemap_alloc_folio(gfp_mask,
259-
mapping_min_folio_order(mapping));
264+
folio = ractl_alloc_folio(ractl, gfp_mask,
265+
mapping_min_folio_order(mapping));
260266
if (!folio)
261267
break;
262268

@@ -426,7 +432,7 @@ static inline int ra_alloc_folio(struct readahead_control *ractl, pgoff_t index,
426432
pgoff_t mark, unsigned int order, gfp_t gfp)
427433
{
428434
int err;
429-
struct folio *folio = filemap_alloc_folio(gfp, order);
435+
struct folio *folio = ractl_alloc_folio(ractl, gfp, order);
430436

431437
if (!folio)
432438
return -ENOMEM;
@@ -751,7 +757,7 @@ void readahead_expand(struct readahead_control *ractl,
751757
if (folio && !xa_is_value(folio))
752758
return; /* Folio apparently present */
753759

754-
folio = filemap_alloc_folio(gfp_mask, min_order);
760+
folio = ractl_alloc_folio(ractl, gfp_mask, min_order);
755761
if (!folio)
756762
return;
757763

@@ -780,7 +786,7 @@ void readahead_expand(struct readahead_control *ractl,
780786
if (folio && !xa_is_value(folio))
781787
return; /* Folio apparently present */
782788

783-
folio = filemap_alloc_folio(gfp_mask, min_order);
789+
folio = ractl_alloc_folio(ractl, gfp_mask, min_order);
784790
if (!folio)
785791
return;
786792

0 commit comments

Comments
 (0)