From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093Ab3LRG4A (ORCPT ); Wed, 18 Dec 2013 01:56:00 -0500 Received: from lgeamrelo01.lge.com ([156.147.1.125]:46203 "EHLO LGEAMRELO01.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251Ab3LRGyJ (ORCPT ); Wed, 18 Dec 2013 01:54:09 -0500 X-AuditID: 9c93017d-b7c5eae000004296-d9-52b1468eb052 From: Joonsoo Kim To: Andrew Morton Cc: Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Naoya Horiguchi , Hillf Danton , 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 Message-Id: <1387349640-8071-13-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387349640-8071-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1387349640-8071-1-git-send-email-iamjoonsoo.kim@lge.com> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Joonsoo Kim 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