From 611d3745f33e18e89fdb7eebb669be6c428dc327 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Wed, 11 May 2022 08:39:52 -0700 Subject: [PATCH] ANDROID: mm: keep __get_user_pages_remote behavior Originally, in the FOLL_LONGTERM case, __get_user_pages_remote returned with __gup_longterm_locked's return value directly but [1] broke the behavior so keep old behavior. [1] d5d9a235764e, ANDROID: mm: retry GUP with orignal gup_flags on failure Bug: 231990030 Signed-off-by: Minchan Kim Change-Id: If91b01c666cfbeb11d535d282c1ee7eec5700125 --- mm/gup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index e942c53c8cea..b831cdecdc94 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1767,7 +1767,8 @@ retry: if (ret < 0 && orig_gup_flags != gup_flags) { gup_flags = orig_gup_flags; goto retry; - } + } else + return ret; } return __get_user_pages_locked(mm, start, nr_pages, pages, vmas,