]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
mm/readahead: add folio allocation helper
authorJens Axboe <axboe@kernel.dk>
Fri, 20 Dec 2024 15:47:41 +0000 (08:47 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 26 Jan 2025 04:22:42 +0000 (20:22 -0800)
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/20241220154831.1086649-4-axboe@kernel.dk
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Brian Foster <bfoster@redhat.com>
Cc: Chris Mason <clm@meta.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/readahead.c

index 2bc3abf07828037928fb42d52a4ea8c3f6e7eec8..722b541c7137f3f0ccf0a35f8be915dc7991e8fa 100644 (file)
@@ -178,6 +178,12 @@ static void read_pages(struct readahead_control *rac)
        BUG_ON(readahead_count(rac));
 }
 
+static struct folio *ractl_alloc_folio(struct readahead_control *ractl,
+                                      gfp_t gfp_mask, unsigned int order)
+{
+       return filemap_alloc_folio(gfp_mask, order);
+}
+
 /**
  * page_cache_ra_unbounded - Start unchecked readahead.
  * @ractl: Readahead control.
@@ -255,8 +261,8 @@ void page_cache_ra_unbounded(struct readahead_control *ractl,
                        continue;
                }
 
-               folio = filemap_alloc_folio(gfp_mask,
-                                           mapping_min_folio_order(mapping));
+               folio = ractl_alloc_folio(ractl, gfp_mask,
+                                       mapping_min_folio_order(mapping));
                if (!folio)
                        break;
 
@@ -426,7 +432,7 @@ static inline int ra_alloc_folio(struct readahead_control *ractl, pgoff_t index,
                pgoff_t mark, unsigned int order, gfp_t gfp)
 {
        int err;
-       struct folio *folio = filemap_alloc_folio(gfp, order);
+       struct folio *folio = ractl_alloc_folio(ractl, gfp, order);
 
        if (!folio)
                return -ENOMEM;
@@ -751,7 +757,7 @@ void readahead_expand(struct readahead_control *ractl,
                if (folio && !xa_is_value(folio))
                        return; /* Folio apparently present */
 
-               folio = filemap_alloc_folio(gfp_mask, min_order);
+               folio = ractl_alloc_folio(ractl, gfp_mask, min_order);
                if (!folio)
                        return;
 
@@ -780,7 +786,7 @@ void readahead_expand(struct readahead_control *ractl,
                if (folio && !xa_is_value(folio))
                        return; /* Folio apparently present */
 
-               folio = filemap_alloc_folio(gfp_mask, min_order);
+               folio = ractl_alloc_folio(ractl, gfp_mask, min_order);
                if (!folio)
                        return;