Commit 2591b516 authored by Keith Busch's avatar Keith Busch Committed by Andrew Morton

dmapool: consolidate page initialization

Various fields of the dma pool are set in different places. Move it all
to one function.

Link: https://lkml.kernel.org/r/20230126215125.4069751-9-kbusch@meta.comSigned-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 36d1a289
...@@ -274,6 +274,9 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) ...@@ -274,6 +274,9 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
unsigned int offset = 0; unsigned int offset = 0;
unsigned int next_boundary = pool->boundary; unsigned int next_boundary = pool->boundary;
pool_init_page(pool, page);
page->in_use = 0;
page->offset = 0;
do { do {
unsigned int next = offset + pool->size; unsigned int next = offset + pool->size;
if (unlikely((next + pool->size) >= next_boundary)) { if (unlikely((next + pool->size) >= next_boundary)) {
...@@ -300,11 +303,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) ...@@ -300,11 +303,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
return NULL; return NULL;
} }
pool_init_page(pool, page);
pool_initialise_page(pool, page); pool_initialise_page(pool, page);
page->in_use = 0;
page->offset = 0;
return page; return page;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment