From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181AbdAXNxZ (ORCPT ); Tue, 24 Jan 2017 08:53:25 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33434 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751154AbdAXNxU (ORCPT ); Tue, 24 Jan 2017 08:53:20 -0500 From: Mike Rapoport To: Linux-MM Cc: Andrea Arcangeli , Andrew Morton , "Dr. David Alan Gilbert" , Hillf Danton , Mike Kravetz , Pavel Emelyanov , LKML , Mike Rapoport Subject: [RFC PATCH 1/5] mm: call vm_munmap in munmap syscall instead of using open coded version Date: Tue, 24 Jan 2017 15:51:59 +0200 X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485265923-20256-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1485265923-20256-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17012413-0040-0000-0000-000003397E6D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17012413-0041-0000-0000-00001EA8F9F1 Message-Id: <1485265923-20256-2-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-01-24_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1701240098 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit dc0ef0df7b6a (mm: make mmap_sem for write waits killable for mm syscalls) replaced call to vm_munmap in munmap syscall with open coded version to allow different waits on mmap_sem in munmap syscall and vm_munmap. Now both functions use down_write_killable, so we can restore the call to vm_munmap from the munmap system call. Signed-off-by: Mike Rapoport --- mm/mmap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index b729084..f040ea0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2680,15 +2680,8 @@ int vm_munmap(unsigned long start, size_t len) SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) { - int ret; - struct mm_struct *mm = current->mm; - profile_munmap(addr); - if (down_write_killable(&mm->mmap_sem)) - return -EINTR; - ret = do_munmap(mm, addr, len); - up_write(&mm->mmap_sem); - return ret; + return vm_munmap(addr, len); } -- 1.9.1