From patchwork Tue Nov 29 16:44:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13058825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E2FAC4167B for ; Tue, 29 Nov 2022 16:44:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E06808E000A; Tue, 29 Nov 2022 11:44:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB9508E0008; Tue, 29 Nov 2022 11:44:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBBC78E000A; Tue, 29 Nov 2022 11:44:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AA6AD8E0008 for ; Tue, 29 Nov 2022 11:44:32 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7A7E9C0FF3 for ; Tue, 29 Nov 2022 16:44:32 +0000 (UTC) X-FDA: 80187053184.26.F3A46E1 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf17.hostedemail.com (Postfix) with ESMTP id D9C6E40002 for ; Tue, 29 Nov 2022 16:44:31 +0000 (UTC) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ATGPi3V017345; Tue, 29 Nov 2022 16:44:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=Ufnemc5E8l7su13CiARu4CuypqBYWD/DnCBOjfPQad0=; b=pWDX0u0G37VVN0JAoEcpb6q99moeUBzKU9bypuK7vlfRRWTp8X1ekyIgQeFAo2hInO/b iT0GeZpzEF2HWRk5qsqoxqYtozgwlAEuDE5seHlsPChrfLoPtSKSWUMH87TXRnnI664f njOE/J280GViOGuLIBxmV32GAtGr1xSEBL2Kql6/gYGffjgnzyoBJX16ymlV8wPzKkFK 4JesEp0WV5ICzrgxri8HD3JTdACRcmmJ/o6vVhqSro7ePYgrDITA0UR2pGvfxeHqi26N QjGF/HnMIfYUbiQvkIhFLq42xc1hbl8Wdkxc8FWOlQ6K5ejNVPT4qBIoSdR+x7UdjYzb aQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3m3xht6hmk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2022 16:44:30 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2ATFhsPd027963; Tue, 29 Nov 2022 16:44:29 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3m3987f2au-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2022 16:44:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nULxEEnSGeMNS40XL+NEMXEK6RtRW25mv8UconbZ1tSh0YYD71vgu+Yi2WbKmQ0GAATCo2Ms/KpsYrKvfrRwavWJpdv4twCXNWOxnisGBY7Ba31v78T/aegsg649HMizD8BZjaDPelFQ4OQ5fBUP2w6h3t6YywR61TUpppHeYvUMFBZkmO9HU+ymDG495B9/aYcX4DRgS3UhCFB3xF9fXBxkfQziSHADNnHtpVkHgl+ZH9Q4Ji5I27YblWb5ydfBfJf4JzRH1hpTLS7cXplIomS6Dq3bCdmZi95q9TVn2GfE1DWdwwhqOHygOVyx1HS3wqbY5NFu/QuKcm8NgXESxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ufnemc5E8l7su13CiARu4CuypqBYWD/DnCBOjfPQad0=; b=lCXjg4jBDanCLibEZu5I55AwIM7Dy8txKxZW3N/JFpw6ab1R0aTqg3N3THQUyFRQUlbPHerJU81mwzmcCWJX350a/uOhfoFddeAC0CoJIuuh/dYO1cAYAgXqVk+qILnyzsqmHDYREEVd40eJatPDA3D88AYYnF5ogrg+xfIoo9fe17G3caFMuOpFVgfwbTatKerqTpZxdOjsF9cBO8hR3brpB/vKPDMRwnavyYBU/sWBvikGnHweRlzLVyCL0ZflaZv+22607SKrwyNcJnqu13JBV0003Xxmt5sFpl+JgOTsXq8A1oY+8+3O8Cubc7pE8ooTYdvZBG9FQvGxJ55ICA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ufnemc5E8l7su13CiARu4CuypqBYWD/DnCBOjfPQad0=; b=xhuZ3HEiJnFlXTSUStNktkK/Hp1V46Jpf1oXHTNxH70Bmuv3cSRXjbD4ZNtK5w9a3BgnpAWDVQd2Sx2koLHCFWy5lb1W+J50IMguVf470m8EA7kw7ClV9BTJ77eGP3ZS74/tjmAYkkb2TcpwGfLXzbmJNgws76RmNVJA/L2ALYc= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SJ0PR10MB5788.namprd10.prod.outlook.com (2603:10b6:a03:3df::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.21; Tue, 29 Nov 2022 16:44:27 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682%4]) with mapi id 15.20.5857.022; Tue, 29 Nov 2022 16:44:27 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Liam Howlett , Liam Howlett Subject: [PATCH 13/43] ipc/shm: Use the vma iterator for munmap calls Thread-Topic: [PATCH 13/43] ipc/shm: Use the vma iterator for munmap calls Thread-Index: AQHZBBHXQ2dH3de69kOOD2y6QD9gPw== Date: Tue, 29 Nov 2022 16:44:25 +0000 Message-ID: <20221129164352.3374638-14-Liam.Howlett@oracle.com> References: <20221129164352.3374638-1-Liam.Howlett@oracle.com> In-Reply-To: <20221129164352.3374638-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR10MB3022:EE_|SJ0PR10MB5788:EE_ x-ms-office365-filtering-correlation-id: 5967641a-894e-4cc2-80d7-08dad228faa1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Tot/ScNto2RuoVR0KwYAhqU1E05AqwYPitBsG8OrbeY3dxQ+/1uIHaamdveHAOsr5fQynIEACCo+DZ96T5HpKL34fi+YRFQ2otb2JcofWxAelPFrhucPipAlkpTGk4luzeJKh3V14vFGRPRuXMVJAUTwl0XG/fVyNKpcA8RhsxSs4Qd9xFfnb/Xnt9qkgVDPe0j9OgbOSUFSuPgeIbAln0OAAB3xuEI9OUgHWvlx2DxYRKYUQXkVQrr+GUcrCS43Rw8s72zaM7rNPvRGVTqHwXA19e1cd3AXfmLRpQxIevR7YkEF2u4H9pTgdfvpzI6KqfutS9e4J85EeFhsJQkm8Pdb81G6hhxqqc5F67LCf3nDAiSbCBhU3cDksGAh5UPDyBc8+FvPE08LShUzBIyCe62FzddEPl9fE2heMsWaHmCK8MA/he+rZJznP3jEWa0JEYcTGOFKb1hkXdW37idQ6nEkKrOUkDYqL+oGbOYw0CmXjuwLm73Yt1Xw5JRj/o3l5VURFzVPhYoC4ZjPzkPxlpQXV+PehEFFIvBCjVycSdYznuJaHdwvNNcYRN/da07mhM4B+DjqFttpeiaxn5MPepH9ZDD8TXOrpdSvwe2YLBvHbi1vwEFue3mS6H3USlL/rbbNjtF8ge/oQZ9ZO1g5W3c8wiyyNGeHbX52jbjNurpxf0K3lJERayxJBImlsnHfWbqP5l/OLlUxs2+e8/IxYw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(346002)(396003)(136003)(39860400002)(376002)(451199015)(2906002)(44832011)(41300700001)(76116006)(5660300002)(36756003)(54906003)(316002)(66446008)(110136005)(6486002)(91956017)(66946007)(71200400001)(4326008)(64756008)(8676002)(66556008)(8936002)(66476007)(6512007)(6506007)(26005)(2616005)(107886003)(186003)(1076003)(478600001)(38100700002)(83380400001)(38070700005)(122000001)(86362001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?ZFWJvYYL4G5RhTO+KvydPzv?= =?iso-8859-1?q?vIx+xipRRo5gp3N2fYPXaQSSHaN3827WNSLK8CNw6BYAZxIFEiTM2R7CaBgS?= =?iso-8859-1?q?Wa+UIpVyzsTr85ooocazrn1N6m58qcSbiqJ3JysdcNXYsZ1GmniP6BgAm6N2?= =?iso-8859-1?q?tnfw5VzaLEk478i0hxYCmaPo6yxsHpnIS2YtLhwV5BCTmkxwhhNiYTpqpqGT?= =?iso-8859-1?q?i8gjeHuaMfiXCyJF0isN77tq9pf3xMEinfJ9reSfyx07v6GutJpb2Xj7zTAs?= =?iso-8859-1?q?GuuvsIwOP1Hf6XgUYdQe1f3AaE9L4OewFGwkzd+lGGjvv4wWTcbwxOixL02f?= =?iso-8859-1?q?gYm0LUVmHokACWgkrxtPkAKcOFQ/EGswC+hJTuMIfTXWhCGwxFh09HLiPHed?= =?iso-8859-1?q?E7mgF2UfvS+4L3Xp/8Bdcx0FLdkJ2bWTp2W5SkPdk6F7zSfvMb25bHSEqnjU?= =?iso-8859-1?q?kmR1WThehRzxDcKWk8KMfk8MzTCOaKwJ99Z7xf0T6UlqnOEh6Ug/WRfb0xth?= =?iso-8859-1?q?nMYUyZYGPT5WrDz4D9ffL8uEKa0RVIhj3kZOJ13zAepHPVkrko2J/cPTBQ0h?= =?iso-8859-1?q?CsQPxfnsRN10rVucNfFFkC8k0jqweyN/5YnAVGfEojrvcGg+w3zccgcxyR/5?= =?iso-8859-1?q?z4fh2h/9IdUU0PRB3gxNNFMdPGKXZh/7GyVHFjsmAsfnD5pU5YdGbKntxoUf?= =?iso-8859-1?q?nH8+IYpNrhvknVUBf2Xy0pYf5UI9nmvoDrCD2QzvejQdQU2foYrpOgVwUZhc?= =?iso-8859-1?q?U50d3ouDNrhxL2N9rSYEWgMWIIXV11ynYrISdZr/2I0k8F3zmeqh2BT8PUSl?= =?iso-8859-1?q?rQfYIqvTiJ+k3Phard4nRb0i94J6QuEY/zjEToEo/LNI1B399AGNhler6ldp?= =?iso-8859-1?q?Of7/o46oXmD0lfUoSUkYOM9hnjYWqAn11owk8UADVpNQ1fKAslAWEQFuvdYL?= =?iso-8859-1?q?og6ADEGm74wV0CETGKiFT6TCHoxPndpKVW+KnnQDS2qFC135GMGXWuCZ+jyZ?= =?iso-8859-1?q?/Qm6VypM99RW1IZRWCg3itX4J8rNRF7iHI8UBK0YDDdQM4xNGKR2mzbUwrQ0?= =?iso-8859-1?q?Mh8sIqx/Y7UUybrozD0szA8auyLsuEHiK0sy84kvGHRTZzdV2TrlN64em4Ge?= =?iso-8859-1?q?VgCyv/LR4MLUhHGaQGS/zXhfByhv5XR3cnpo1QYUATObmYQTzTov/M8GedsC?= =?iso-8859-1?q?bAfES5ZX5jt3BjKaMmrDQA/5MdtcR7MF74Cy8cRCulb6N68T2HsAbM8ynLHB?= =?iso-8859-1?q?DueRH5x8OaDP6aryYEJv3SeGqME940h8XFcQRqFBV+/HAGDPyP14VtP0M/o3?= =?iso-8859-1?q?kqxXEDZTAchRPjkes467luhKtfj/ofm5we88odZGPwc1vxJswHsFMbfkX4TO?= =?iso-8859-1?q?k2SzsbxOKLmsTYhMOAbmSj2tSiijFaynz7Uq4QaRQVzL15+Q42KUbnckoS2H?= =?iso-8859-1?q?8rXTcg9LZsyc9ab3Ytnmsdx+9OLf+NSIfQEDf9JQDo8iXMjZlA0o1qTcGpza?= =?iso-8859-1?q?sD8Wh5j7FyKQHKlm61gVpw28LvDfMpz/G4kuvOH+rP+dh4P69AhCvr5J4SQs?= =?iso-8859-1?q?0gPIKR731NYsTAxubAyveUazaH4B1jhOBAdakMaqqjBfFn0c+wM/BfGOUMVr?= =?iso-8859-1?q?z/9Awc90DOVcEKX00cGlEnpYkkf50j5+bM4zxJA=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: iRdC+b17qSHaNRViSWpk03u1eB2Xa32CEYGHLSG+IDCI+lgV7DUl3EiNxHRZrPdph31N8h2kkbU3a3NP6sQtgPsdSHzJ3oYzq8c47ST1dJ09jWH9Sv06x9C1BASRXntocmDbhWfeIrfZ5CVW8hJ8+jPgaLAgZ3PZsA2KUCMt95lbqQK0m84lEmnYo9st5/M4wi3yySLbDG7QyjcamZf2U3kzDXc6x274PvVZQzPb/c5CXa9X/42rzFeXWdMHeEfsZoGv1sf/c+ZUSKMtIGfWxGntfzS2r8eGcYp+NFO+G1pHhaEm6IWDmW5cYE0Dccg4VNUWBcO0CdqcsFjoI+uDPXWzd4mGHktt8IfuIhtt5LA8qKYmGfZ+skRgUqs850JcTuagx0o/lna6+b62tWVPsCB+kn6Dw8/KFPvzCvIckRE8VN5OaRcBKYzvzRV0xle7JqFX9ZDeczkOzxmtVYGfMh+JbKsGaEPWePM+wlUwYp5hPBqkkll9p+h5qcfLW+ooBq3Qch1sLrEAnKGfFIfEYuX+TNINNVdJvNuPGGygrhTKere72dCvJrPp5m+idz8P1qS4qC7S3ZF8U3Ft+Q3KPKPozfow9BmmKyK9kqD1kgF0nhPzrcbKvOycr3SRF9c2r1K8q3HCavd1JUo3sLICU5+fr5xzLf7q0Cec0IK3TBykCUD7boFGUCelBkrHyNqfBfF0E17wb9hGuSp0k57JTHEH/ozAvimYB9FLk8NkM9cfblX6g/m4aaixGk5Rs9PxqsyKkEEpXbFGz+/IcrD6FSAmyT9onKVFQXLo57eyqF+VHe3DZZzFybJfitFV0lFi7CsvMV9PoeeBqh08gQBWi1iamsukcCOEfK091whPvFR9ygkOWIRYlJ/G1jVA/ANevwPJrzj56k+AF9NNem/azw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5967641a-894e-4cc2-80d7-08dad228faa1 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2022 16:44:25.9260 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nvE+VmwZnqupaEdbCCvIKLK1U2IJmplM3SB/sgotp7Ro7afLwgYrV8UbNZZE17FsoFd5qUJSMxiHcXM+cDzrtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5788 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-29_11,2022-11-29_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 phishscore=0 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211290093 X-Proofpoint-GUID: EeGPAVROID8zDfWFbmAM5eutt2hLEJ14 X-Proofpoint-ORIG-GUID: EeGPAVROID8zDfWFbmAM5eutt2hLEJ14 ARC-Authentication-Results: i=2; imf17.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=pWDX0u0G; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=xhuZ3HEi; spf=pass (imf17.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1669740272; a=rsa-sha256; cv=pass; b=W4um2qvz+/RwJNsoOAZXacFY+92rIw+XBz4RPeOhrXiCVWcq0F/NMl68si1nnThg8VBb7K OK7h5QmuQj7b3/qR0QXEBAF8dOiDZ5kCwdzpMdOpJTIlVpuV8bH6B2vuGbhKm+Vch1ngZm xCxssj02A8qKWJXk6xtHHBZY43TROj4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669740272; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ufnemc5E8l7su13CiARu4CuypqBYWD/DnCBOjfPQad0=; b=ocQGUM0aKqjxx7A63UE4mzfcBMGNF3YY5nPc+PF0WWwIMQo37ZnTpy11Xen+2HzxXaFYB8 LoEr3PInh6gPU+Lgo7BLdqnyDd8CKqBl1Zg4uzwI5O0roWXFi+ZwWfliG198bYuFztXgRm j0LTc1Vf8mFw9fpq784SG+tegZiVe2A= Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=pWDX0u0G; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=xhuZ3HEi; spf=pass (imf17.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D9C6E40002 X-Stat-Signature: 94chd3gbbyjmpsiodhz1zweusiy1nkd1 X-Rspam-User: X-HE-Tag: 1669740271-950120 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Liam R. Howlett" Pass through the vma iterator to do_vmi_munmap() to handle the iterator state internally Signed-off-by: Liam R. Howlett --- ipc/shm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ipc/shm.c b/ipc/shm.c index 7d86f058fb86..b866a5ea2e78 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1770,8 +1770,8 @@ long ksys_shmdt(char __user *shmaddr) */ file = vma->vm_file; size = i_size_read(file_inode(vma->vm_file)); - do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL); - mas_pause(&vmi.mas); + do_vmi_munmap(&vmi, mm, vma->vm_start, + vma->vm_end - vma->vm_start, NULL, false); /* * We discovered the size of the shm segment, so * break out of here and fall through to the next @@ -1794,10 +1794,9 @@ long ksys_shmdt(char __user *shmaddr) /* finding a matching vma now does not alter retval */ if ((vma->vm_ops == &shm_vm_ops) && ((vma->vm_start - addr)/PAGE_SIZE == vma->vm_pgoff) && - (vma->vm_file == file)) { - do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL); - mas_pause(&vmi.mas); - } + (vma->vm_file == file)) + do_vmi_munmap(&vmi, mm, vma->vm_start, + vma->vm_end - vma->vm_start, NULL, false); vma = vma_next(&vmi); }