mm/gup: Remove for_each_compound_head()

This macro doesn't simplify the users; it's easier to just call
compound_next() inside a standard 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>

diff --git a/mm/gup.c b/mm/gup.c
index 346bfcd..a88133b 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -276,9 +276,6 @@ static inline void compound_next(unsigned long i, unsigned long npages,
        struct page *page;
        unsigned int nr;
 
-       if (i >= npages)
-               return;
-
        page = compound_head(list[i]);
        for (nr = i + 1; nr < npages; nr++) {
                if (compound_head(list[nr]) != page)
@@ -289,12 +286,6 @@ static inline void compound_next(unsigned long i, unsigned long npages,
        *ntails = nr - i;
 }
 
-#define for_each_compound_head(__i, __list, __npages, __head, __ntails) \
-       for (__i = 0, \
-            compound_next(__i, __npages, __list, &(__head), &(__ntails)); \
-            __i < __npages; __i += __ntails, \
-            compound_next(__i, __npages, __list, &(__head), &(__ntails)))
-
 /**
  * unpin_user_pages_dirty_lock() - release and optionally dirty gup-pinned pages
  * @pages:  array of pages to be maybe marked dirty, and definitely released.
@@ -329,7 +320,8 @@ void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages,
                return;
        }
 
-       for_each_compound_head(index, pages, npages, head, ntails) {
+       for (index = 0; index < npages; index += ntails) {
+               compound_next(index, npages, pages, &head, &ntails);
                /*
                 * Checking PageDirty at this point may race with
                 * clear_page_dirty_for_io(), but that's OK. Two key
@@ -417,8 +409,10 @@ void unpin_user_pages(struct page **pages, unsigned long npages)
        if (WARN_ON(IS_ERR_VALUE(npages)))
                return;
 
-       for_each_compound_head(index, pages, npages, head, ntails)
+       for (index = 0; index < npages; index += ntails) {
+               compound_next(index, npages, pages, &head, &ntails);
                put_compound_head(head, ntails, FOLL_PIN);
+       }
 }
 EXPORT_SYMBOL(unpin_user_pages);