Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758038AbcJRJDE (ORCPT ); Tue, 18 Oct 2016 05:03:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51152 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752796AbcJRJCq (ORCPT ); Tue, 18 Oct 2016 05:02:46 -0400 From: "Aneesh Kumar K.V" To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Aneesh Kumar K.V" Subject: [PATCH] mm/hugetlb: Use huge_pte_lock instead of opencoding the lock Date: Tue, 18 Oct 2016 14:32:34 +0530 X-Mailer: git-send-email 2.10.1 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16101809-0016-0000-0000-000004F1B8FE X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005933; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000187; SDB=6.00769711; UDB=6.00368804; IPR=6.00546133; BA=6.00004814; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00013028; XFM=3.00000011; UTC=2016-10-18 09:02:41 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16101809-0017-0000-0000-000033E030EA Message-Id: <20161018090234.22574-1-aneesh.kumar@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-18_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610180152 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 992 Lines: 33 No functional change by this patch. Signed-off-by: Aneesh Kumar K.V --- mm/hugetlb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index da8fbd02b92e..2ff57dfb772d 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3648,8 +3648,7 @@ static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, vma_end_reservation(h, vma, address); } - ptl = huge_pte_lockptr(h, mm, ptep); - spin_lock(ptl); + ptl = huge_pte_lock(h, mm, ptep); size = i_size_read(mapping->host) >> huge_page_shift(h); if (idx >= size) goto backout; @@ -4266,8 +4265,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) if (!spte) goto out; - ptl = huge_pte_lockptr(hstate_vma(vma), mm, spte); - spin_lock(ptl); + ptl = huge_pte_lock(hstate_vma(vma), mm, spte); if (pud_none(*pud)) { pud_populate(mm, pud, (pmd_t *)((unsigned long)spte & PAGE_MASK)); -- 2.10.1