[2/2] mm: remove foll_flags in __get_user_pages

Commit Message

Josef Bacik July 18, 2024, 9:26 p.m. UTC

Now that we're not passing around a pointer to the flags, there's no
reason to have an extra variable for the gup_flags, simply pass the
gup_flags directly everywhere.

Signed-off-by: Josef Bacik <[e-mail]>
---
 mm/gup.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

David Hildenbrand July 19, 2024, 1:24 p.m. UTC | #1

On 18.07.24 23:26, Josef Bacik wrote:
> Now that we're not passing around a pointer to the flags, there's no
> reason to have an extra variable for the gup_flags, simply pass the
> gup_flags directly everywhere.
> 
> Signed-off-by: Josef Bacik <[e-mail]>
> ---

Acked-by: David Hildenbrand <[e-mail]>

Patch

diff --git a/mm/gup.c b/mm/gup.c
index 985d5141592f..120740cf5a34 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1437,7 +1437,6 @@  static long __get_user_pages(struct mm_struct *mm,
 
 	do {
 		struct page *page;
-		unsigned int foll_flags = gup_flags;
 		unsigned int page_increm;
 
 		/* first iteration or cross vma bound */
@@ -1488,9 +1487,9 @@  static long __get_user_pages(struct mm_struct *mm,
 		}
 		cond_resched();
 
-		page = follow_page_mask(vma, start, foll_flags, &ctx);
+		page = follow_page_mask(vma, start, gup_flags, &ctx);
 		if (!page || PTR_ERR(page) == -EMLINK) {
-			ret = faultin_page(vma, start, foll_flags,
+			ret = faultin_page(vma, start, gup_flags,
 					   PTR_ERR(page) == -EMLINK, locked);
 			switch (ret) {
 			case 0:
@@ -1547,13 +1546,12 @@  static long __get_user_pages(struct mm_struct *mm,
 				 * large folio, this should never fail.
 				 */
 				if (try_grab_folio(folio, page_increm - 1,
-						   foll_flags)) {
+						   gup_flags)) {
 					/*
 					 * Release the 1st page ref if the
 					 * folio is problematic, fail hard.
 					 */
-					gup_put_folio(folio, 1,
-						      foll_flags);
+					gup_put_folio(folio, 1, gup_flags);
 					ret = -EFAULT;
 					goto out;
 				}