Messages in this thread Patch in this message | | | From | Joonsoo Kim <> | Subject | [PATCH v3 12/14] mm, hugetlb: clean-up error handling in hugetlb_cow() | Date | Wed, 18 Dec 2013 15:53:58 +0900 |
| |
Current code include 'Caller expects lock to be held' in every error path. We can clean-up it as we do error handling in one place.
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1817720..a9ae7d3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2577,6 +2577,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, int outside_reserve = 0; long chg; bool use_reserve = false; + int ret = 0; unsigned long mmun_start; /* For mmu_notifiers */ unsigned long mmun_end; /* For mmu_notifiers */ @@ -2601,10 +2602,8 @@ retry_avoidcopy: * anon_vma prepared. */ if (unlikely(anon_vma_prepare(vma))) { - page_cache_release(old_page); - /* Caller expects lock to be held */ - spin_lock(ptl); - return VM_FAULT_OOM; + ret = VM_FAULT_OOM; + goto out_old_page; } /* @@ -2623,11 +2622,8 @@ retry_avoidcopy: if (!outside_reserve) { chg = vma_needs_reservation(h, vma, address); if (chg < 0) { - page_cache_release(old_page); - - /* Caller expects lock to be held */ - spin_lock(ptl); - return VM_FAULT_OOM; + ret = VM_FAULT_OOM; + goto out_old_page; } use_reserve = !chg; } @@ -2661,9 +2657,8 @@ retry_avoidcopy: WARN_ON_ONCE(1); } - /* Caller expects lock to be held */ - spin_lock(ptl); - return VM_FAULT_SIGBUS; + ret = VM_FAULT_SIGBUS; + goto out_lock; } copy_user_huge_page(new_page, old_page, address, vma, @@ -2694,11 +2689,12 @@ retry_avoidcopy: spin_unlock(ptl); mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end); page_cache_release(new_page); +out_old_page: page_cache_release(old_page); - +out_lock: /* Caller expects lock to be held */ spin_lock(ptl); - return 0; + return ret; } /* Return the pagecache page at a given address within a VMA */ -- 1.7.9.5
| |