lkml.org 
[lkml]   [2022]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 02/75] mm/gup: Remove for_each_compound_range()
Date
This macro doesn't simplify the users; it's easier to just call
compound_range_next() inside the loop.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
---
mm/gup.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 08020987dfc0..dc00e46fae5a 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -261,9 +261,6 @@ static inline void compound_range_next(unsigned long i, unsigned long npages,
struct page *next, *page;
unsigned int nr = 1;

- if (i >= npages)
- return;
-
next = *list + i;
page = compound_head(next);
if (PageCompound(page) && compound_order(page) >= 1)
@@ -274,12 +271,6 @@ static inline void compound_range_next(unsigned long i, unsigned long npages,
*ntails = nr;
}

-#define for_each_compound_range(__i, __list, __npages, __head, __ntails) \
- for (__i = 0, \
- compound_range_next(__i, __npages, __list, &(__head), &(__ntails)); \
- __i < __npages; __i += __ntails, \
- compound_range_next(__i, __npages, __list, &(__head), &(__ntails)))
-
static inline void compound_next(unsigned long i, unsigned long npages,
struct page **list, struct page **head,
unsigned int *ntails)
@@ -396,7 +387,8 @@ void unpin_user_page_range_dirty_lock(struct page *page, unsigned long npages,
struct page *head;
unsigned int ntails;

- for_each_compound_range(index, &page, npages, head, ntails) {
+ for (index = 0; index < npages; index += ntails) {
+ compound_range_next(index, npages, &page, &head, &ntails);
if (make_dirty && !PageDirty(head))
set_page_dirty_lock(head);
put_compound_head(head, ntails, FOLL_PIN);
--
2.34.1
\
 
 \ /
  Last update: 2022-02-04 21:04    [W:0.362 / U:1.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site