Messages in this thread Patch in this message | | | From | john.hubbard@gmail ... | Subject | [PATCH] mm/gup: finish consolidating error handling | Date | Wed, 21 Nov 2018 00:14:02 -0800 |
| |
From: John Hubbard <jhubbard@nvidia.com>
Commit df06b37ffe5a4 ("mm/gup: cache dev_pagemap while pinning pages") attempted to operate on each page that get_user_pages had retrieved. In order to do that, it created a common exit point from the routine. However, one case was missed, which this patch fixes up.
Also, there was still an unnecessary shadow declaration (with a different type) of the "ret" variable, which this patch removes.
Fixes: df06b37ffe5a4 ("mm/gup: cache dev_pagemap while pinning pages")
Reviewed-by: Keith Busch <keith.busch@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Dave Hansen <dave.hansen@intel.com> Signed-off-by: John Hubbard <jhubbard@nvidia.com> --- mm/gup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c index aa43620a3270..8cb68a50dbdf 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -702,12 +702,11 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (!vma || start >= vma->vm_end) { vma = find_extend_vma(mm, start); if (!vma && in_gate_area(mm, start)) { - int ret; ret = get_gate_page(mm, start & PAGE_MASK, gup_flags, &vma, pages ? &pages[i] : NULL); if (ret) - return i ? : ret; + goto out; ctx.page_mask = 0; goto next_page; } -- 2.19.1
| |