From patchwork Thu Jan 5 19:16:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13090336 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 AD11FC4708E for ; Thu, 5 Jan 2023 19:16:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7FEE78E0001; Thu, 5 Jan 2023 14:16:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7AE408E0006; Thu, 5 Jan 2023 14:16:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 517D08E0001; Thu, 5 Jan 2023 14:16:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 158688E0001 for ; Thu, 5 Jan 2023 14:16:46 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EF425A0423 for ; Thu, 5 Jan 2023 19:16:45 +0000 (UTC) X-FDA: 80321702370.20.5740534 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf15.hostedemail.com (Postfix) with ESMTP id 93322A0007 for ; Thu, 5 Jan 2023 19:16:42 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Y68xLo2c; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Lqw+QsUk; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf15.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672946202; 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=v7b7Y0VoKjU/443c479HAnuhJa8h7cdUlvoZe/Bl8Hg=; b=V0U+COwfmMYpcDBm253uEplmBhlHtFhKLPFsPy6WRxHRT2ubV3BUc0jG+kWg3QGDaDWJDw u5sHNyAjTnF2K85MUGlcAdykUzeTVLEvEeI+JQ29xSZVoSF1WHzlW+v8Ic9R/2BiNo3mFm CivEI5zWYsjfG1sx1Z729sXNBKXyymA= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Y68xLo2c; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Lqw+QsUk; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf15.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1672946202; a=rsa-sha256; cv=pass; b=FtcpgF4q+LOArO8NzeI+ku2xRzYqIxLzAdq/vUcB3jI+r3fiOIGZAryABcusHUQ+5W+qTo noaFT/k8BusKys+QaxCIcpfM/nnjrn/AyOTKgVgRW8XcXZxIhlrZ3Zl8YBS7OJmqD4AARr ztfwn7iHCCIX6wf7oOhB8QZstLem8KY= Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 305IT0r2006649; Thu, 5 Jan 2023 19:16:41 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=v7b7Y0VoKjU/443c479HAnuhJa8h7cdUlvoZe/Bl8Hg=; b=Y68xLo2cg20PIR5TQ3HaFtSIFiuCJ74Vv/yhTEdZZhKGzb8MtWWlpf6FbfWJfu/Psi+4 yTs9kHzDXl/iXR3qhtNE9vhlw9d/hRXiY92mG4kCoeBOQUMpV78W6anp33UvnmagfVWx LRkAKZ3na1FVDY9yPyR5V8XRYCy5VJswa7aRtXn13NxQl/FAg322wT/BLKQ4N9Yz002f 9gagkH7UJOeuyAzSKcauNRrTomNkBF/mPIXiqxa80S+QEDqj8yj29zNSbJOeDsfrc9Vn HnOEdhUuhqqbLw+FiTB7TicsBHJdBfjAeGzkif3TO8Pt6CWTe/VMMmHBg4oNzrP2IieR YA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mtcpt9mth-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:41 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 305I1EPi033688; Thu, 5 Jan 2023 19:16:40 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3mwxkf7u5p-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yz/bOPaKG9GImPZ/sBR7Z4mUWYBx4YySmjL4dCEjvBYLT24NLTj5A3f9VivhT6x54fwPJOZVuVVhbt3CGO1l39+XB6HTXbW7wQXrfeel6QJLe6azbP+PkGyQbuFvNLeqb/fRIQXdusyOePM9QjXJTvyy7p+E9Y1y8BR1eS/DTjVFYL7wSout6/x5CbAKdfqDRWURGOuFrGUDDA3BirOLhTquFN76zic0E4brrm8vdMZWENCaMEgg1kkE4hgpv/qPQajweJWLM63JKmIGoH0wZfBEP1kmgxtMXPizV2f98zb3J80U28KzMcHKq2NMK7eG5aZ8CTwG3MMqH5ad6yKLsA== 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=v7b7Y0VoKjU/443c479HAnuhJa8h7cdUlvoZe/Bl8Hg=; b=eNcBQT8YcwLrChCPQBoMHNHYRs3AUvq3LC1tbmBhgQ+NbJ1ABgEo/3GRpv1QmylruLbN+lLPFuL0pap5dEvJCPT4JUKMAg5zEuUiYq6zP7J3i8pV93Q8pGomKJDSXjFOuMdSWtoA051jT+GbikksTXPvWbDTXdGAhIj6lvsMoLP6Xcsy3OGyOlAdH/IBETmejtEi97R8Rp+TpstpK1EZime8LRmQqZHib9nJ4/AG7CltVlZE8+PDXQdhIcdIEaXTUXCqJ8Db3hpB3UfrJQ6yoIOcTAKX+eHsKfRCJcTQ07Uj7RL394r7cfnCXIy6jT5A3CptriMsQI+RB7Xs6yl96w== 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=v7b7Y0VoKjU/443c479HAnuhJa8h7cdUlvoZe/Bl8Hg=; b=Lqw+QsUklM09aABmH0YH1vZZz9Vhm/Lp5XHS/nvcly7cES3SMsBU4zGaY6oIKXVmenBV8K/BGjrX+qI5igqjWvbYF30JVv+iOII7c/jZSiNegmXIMsnL7xJbWsB0wvr9GlgSg2nJzSnxDeRm/pEKMza5pNqoUfOm2IZ6q6kFdIY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH0PR10MB4791.namprd10.prod.outlook.com (2603:10b6:510:3a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Thu, 5 Jan 2023 19:16:38 +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.5944.019; Thu, 5 Jan 2023 19:16:38 +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 v2 32/44] mm: Add vma iterator to vma_adjust() arguments Thread-Topic: [PATCH v2 32/44] mm: Add vma iterator to vma_adjust() arguments Thread-Index: AQHZITomrGfg1Vg77ES0gv5xU83u9g== Date: Thu, 5 Jan 2023 19:16:02 +0000 Message-ID: <20230105191517.3099082-33-Liam.Howlett@oracle.com> References: <20230105191517.3099082-1-Liam.Howlett@oracle.com> In-Reply-To: <20230105191517.3099082-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_|PH0PR10MB4791:EE_ x-ms-office365-filtering-correlation-id: e5670280-e373-4eef-198d-08daef515e8d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Rxs4xqN9tCdx5cF3+sDF2vD+F3q1J9/bTAa0yKo92XDByqzn6qRFbBWSDgEXiy8UhFrYb9y/poPUShr5KWJWXSAfuR+gq+SeplqGuHzPzCPJBAlsXiT/UysqMyigStzxemxrsMOd0k2b+oUVDMxw0vc+WN9bxA7VB7+DD+smsq/zNillsFAC+nBiX0lKtpIsF/R2i8UGSNEP7rEnEJGZ9mGPRzXZRz43LLcc/KX6SumHc+aVre3pc1iQ4lPGb9sJ2XuVWV9/gY81TiH4SkEAFw664U7Dr1wqXkuDPUgdkH0TcFV0EViNwiApe9MTvkIfSDacLkjFQU8DpignmF2eJ68lYON90mfCMuTFZNsmfNGyPYQhas2PBoHfgkMCa7SbewJvm9Yw8t+qWmYG+a7qxaL8cDIPpoz+y1cqBrHGW9/fGWuOegXQmJntamo06RCpe+b7jbMuVenBx0VXcRTbuhLKVWsyOIPadogO2Bh67w8Cd37TGsIRwu+rfSHJM7y9o2EFIwVBftMv8965xpg0URaQp2nEk9iegnLrmqc1sdFSJ5J3ktyiOp0Q9LHQBMvC7kvAUPGQboNJSg3o61LtcDlU/pg7gb1KvJM//hOUsL1taDGym9SazCYXe0Qg+vrWvsqYqvOsJLI/H0V8Wf96x0bQlWj2/s6oU7YY2hfBaCk0YfPMQ2civaXRTcoycA6jTTXF7C99g7miWTV3irzn+w== 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)(376002)(39860400002)(136003)(346002)(396003)(366004)(451199015)(83380400001)(8936002)(5660300002)(38070700005)(44832011)(38100700002)(36756003)(122000001)(478600001)(107886003)(6666004)(6486002)(2906002)(54906003)(110136005)(6512007)(186003)(26005)(71200400001)(66476007)(64756008)(8676002)(4326008)(66946007)(66556008)(6506007)(91956017)(76116006)(2616005)(41300700001)(66446008)(316002)(86362001)(1076003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?wp+a78ZNV5+HbI4HXkINuSW?= =?iso-8859-1?q?nOemy/QMXp8u2l0ef4eadEMFAtvq/iEMXoebsy6QQeIjvKnEagSxuuKkc8oC?= =?iso-8859-1?q?ki7SxgKKNlBOYabK8v+Fueu5OLsA746s8KDSuJKEclEAfS8nGwsBYTFaA3oC?= =?iso-8859-1?q?pyphpGo7Mdyef7IkgxLoc0D6SzofmtEBZlYbCS1zrtZVXvVDuHLyBneBHIvR?= =?iso-8859-1?q?aOJ44QWVZtFFE8V2VW9RH4Za7pBcKXgAbtavHnMQpHaNl49mPif/Vf/zcunf?= =?iso-8859-1?q?WEDPPwISCZgE6iL5vdHqRlVSZLzpiLQz+LprySQ2xME4UA8tjhen768Nmnw1?= =?iso-8859-1?q?EYCqU8hxBAMWqYYrl0DOkMHB+ZkJrVUbLMR+Ok0po5Dkn5L8ql5wzWasf3TJ?= =?iso-8859-1?q?5SOK7RFdYiwpjTdOmbwVz7oHJlSgP7gcODhGGg+VxmsLyJ6/hnSyFzUBJceg?= =?iso-8859-1?q?kmMmLr/5do2BPDpJeLd0Ao+9zj+hCNVptt/OLZNNEDPVp6SYleD3OqMlH8Qv?= =?iso-8859-1?q?gsRUjqNsILqsa2EKn4eTXTrB66uGqvvFnV8Zj4Bf4U0xtLaWt7JgXpwVqH4u?= =?iso-8859-1?q?W5FfepNHtglkjH/kF9DJZtEG8wnXLAJ/yOa0mih1cH8l5g4yPllm+BOmf8Ag?= =?iso-8859-1?q?cQDlfbBlt2TqOaLZ5UgOGutPnAR7LJKOfMdLLoengZp8b3MqO4LcMbJmhvM5?= =?iso-8859-1?q?vosJYDlrX34k6AS+JZst2nASugrXNoTAb2cDI/j0dafe3UgoeLlXxtmvibR2?= =?iso-8859-1?q?oit1PTiX7hMsWP4Q4O9TCSk5AhlshPM0wya8ecJ68B7+rckRvwni5ouU+Zbk?= =?iso-8859-1?q?z4QNjA10Vh3AQCpo5U74gLb8oPNcpVTOAoN+KhFx3tmCgqbl6r8VtPprSMcq?= =?iso-8859-1?q?KV3AGqcjsGwmZG5rpDWRoqXgjR0o2kS7tQWg7M68E0lAUUihNEH8JCBap9HA?= =?iso-8859-1?q?/w5paDqk4ZW+xEc7aBZIL/c2BOf75QUfDUMeBrPLYlifZe0lmGsRF7lRYYl6?= =?iso-8859-1?q?w7wAJbIHHTBTxWagYgbvnQjn4qESBd5bi6Ko5vZ5gHNoexW5iDXUle09gaRp?= =?iso-8859-1?q?MnvOp7FnjZujLz561R9z6/udSSFclTn3+iLyBMecXPKSLLllVhEDdgJigIcz?= =?iso-8859-1?q?P2qDyhEZtmLSSJRtkra1F1nq9xXq+e4j9goS2uAKiPNerIIQUc+zi9d2UNRz?= =?iso-8859-1?q?9ltMhezMlAvrMnpGbVEN3/Gyw6KtC6xSh6A+1TpbMG7vzM2DSQQEIoafJe0u?= =?iso-8859-1?q?q+1SbCMBYGBSMJlMA/SRbZcDTxKX8EvkFr1xu5PUXSW0W5IEJp8A3nrjTIrC?= =?iso-8859-1?q?wOcaUFcvsyo9ZuNHlTZbHwgGT/sHFBzvoR54sWnuXWY0oDDUt4f4Zfz+A6Tp?= =?iso-8859-1?q?vHQXOWQOq6dZwMgXY3VVjkVbnKHdHQVEbN4kxtzP4wH69ogEIupeabNDxsF1?= =?iso-8859-1?q?uD2NMZcxD1lgXb6ssE8IS4h5K/JkgBsyjSKUn8uR4GCjhBLMC53Gkw+36OFz?= =?iso-8859-1?q?7RndZ2zYPuXlf+wIa/5aT2jUIGjdZFLpcDRpI5clnEljZWzv5Aphz/0fznaH?= =?iso-8859-1?q?mLl1bud11gcvXRzreSWBi++yYhkVe8CO7PHsvYvmhEsh/DADAUnUnV3Ur/8G?= =?iso-8859-1?q?gvBPPoBtBr5B4a9T/f2s/4zuilf3ytxUipshAvQ=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PNuMrITuNc0zKQIMz/tNqxeVnBA3JYevNQ+CzJ1t8A+uTCrj8P3D6gFo5TfBuCeyhBII4sdxOovEVloJZBzaSS8W9NizbqhFjpieYvrp+HcwDSel9FnYT5/LQTV8hubITsZhsM6MguF0fJtHkkvJ+AdgBGDXEXT5XShhmmzX9gWgu9WtUFPyTmsJ40T5XWX4ff4OaPsr+zw7B/GJvXmqdEf4iVNYxsO6pMD+ggPBZO5aOIk2VNwoM7bz6uyFYTdUvcRuNkspLQfg03naqyKR6GhC3NiYkmlODOgguF9RKXyK8rtYFyImGcelmdWxnE72tJYrhRK4Muan1zvv79mqKKFFaOZI2YhJ/7FbyqlvRKCEX/ShvHpBye3z8Iver82Yu2lKF/lQT62Wtq8UqaI08mYdxd1Qwp3t14Mrf+mPUyFf9/atq4nxuTd0CPc1+/fxJ1QUkLz4Q2z4gIT8IbvekvhovwIfa9ygv/UYsyhKdkWWqSVZdToF190m1nAWWrYhV0WopxyXeUKSRTT6L7nU0rch5bH05b4p1k91R7C27VCMz2JsPfFL0f07yIfoKD59HON3H1wrxDHpbTXQwoWatbvrQAhQvuz62HTszRfLtL9rTiVgPe8d0q9Eq/2cwE/fvbq/YnHkzZsVXz7sjZGOXDvjPY2tRqV6SLaAn1iYvpRfVmIlLm6ecn0e4ngnZ+pLbUi7f5GY2+PlbvAO9vM8jOQScjXe5dRTpc2/5ODTQEt8SYvaTE1AO8ZFKFtdSdMnFnA0aBOqXmwmTzNubjQnKk+xY1eClsPu6hcrp0yomFePOCZrEFMMUK+9mM03AFWCV8Bw3CwNC4NlCMiYHAj+UcOElWOxJzCGjd5AWLZyDDFrpz27gPnOQK3rxNTZuUO5mx4Ah6lTUpz5yIrX6xnkqg== 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: e5670280-e373-4eef-198d-08daef515e8d X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:16:02.4690 (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: DuKWcZTrfwVbuobjlTki6Bnz8SBtclYuOgcvuDfL+Q+6LRieL7/rVdfTk6RoWVfLRBJmbnKzyu9WRmESvevQ+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4791 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-05_10,2023-01-05_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301050152 X-Proofpoint-ORIG-GUID: M_ezwJCLR7JhoE-T98Y8nKceYJqz-p3P X-Proofpoint-GUID: M_ezwJCLR7JhoE-T98Y8nKceYJqz-p3P X-Rspamd-Queue-Id: 93322A0007 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: erfzyrt5e3uk3unogioqup41js8a68ux X-HE-Tag: 1672946202-172056 X-HE-Meta: U2FsdGVkX18lU7gaMeO5L5JmA268WINDZH88xp3X7vbbInvpo9XmXSLxm+ZkkyjjzwydF/eOPctLATBXyV6435E97dX8eJTfhfpdT7otANeU2GkKiu5APoflXMgNvkNcfP21WcY9BDBrXW1n4X4bIEK/cKU8o0qOMQyOsrKhzoHuCaoSt6u9s/26+AzJTMOhVErvwstvAGNETnE4pgQRtuCcB4WmRKFHG/O3TPaJv5y9LVo//dPJyN0t1enok40TqtyDdhhSfOX+5VxQxC4rqSRUq90x4+wpM1S3BCl7jdLhH36RE6hm8HP/c3b0wYrH3eP0ugu2+3odPealxVujEDuqcXBRol7dcabKX6sVvY1IWf/d1ELV1gI6R4FO7Lb6bnqZJmeVNkxwYxY/Sj0ImieZZj38YMVy5Rz+giGxOJn9mcZgYvYV4MxtDICEQCXT1U3OcxJY/uX9aXIASGTIKF5Dzp7pDxjqHTXr4o9axC4NIoqGkx6NDPSRDk0FRijOvebBlSes76nBVAEiedCtSAuzNR3I38ezpZKax69nRnKpqMHVUR0tY8WZqYJGR8J8LaJgTchYsgC/eSuzTh41niQlcqk5EjY0xL/ZTiRM1IZee66ryyp9D2RA5freBkJL8TNcHIc6qbRIbphUsC1zDfbgPIDri8LBw5zTF09o1zBWEygxAneZbHXInx5WiwuPkMwSJWoMfpDpML5esvIhmsSXumkP4pI/D7JBfjPQg9P/B+f3Ht3MZayauBSbqH2/nBPeycPnPAB2r2ZFGrk7TyR7/DusfWxCq4swd5xDl6wtOe9pZCS7y+f2oTX3kr9z2sYRhLf6ZTIM8ngPJQ2+FuPeHtg5f/DRk4bDiFMOGErPvy9kMDWjvzPXJikPzocHLDo5nQmZ9TGcY2n4XL4bYJncbo8unkQda8MMogIi+cUSkBVczUbkvAYWcEimUeiOjWkD7cDHOp8ae/qvzNs 5yEv4nwm skWFzFb8/gCbbZ8JQmH2J/wCpsIJVmV9iIkyUEV/pWleTkybDzEsvFo+mqlErldN+a5811giHIgPc6B22K1MBdqCdJFHnW5q5ppOa/OFn1b63ur9sGSlvxl4h6oj8BziBhfS0LN0nhGV+fxBO3yUWtkRV/w== 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" Change the vma_adjust() function definition to accept the vma iterator and pass it through to __vma_adjust(). Update fs/exec to use the new vma_adjust() function parameters. Revert the __split_vma() calls back from __vma_adjust() to vma_adjust() and pass through the vma iterator. Signed-off-by: Liam R. Howlett --- fs/exec.c | 11 ++++------- include/linux/mm.h | 9 ++++----- mm/mmap.c | 10 +++++----- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index b98647eeae9f..76ee62e1d3f1 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -699,7 +699,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) /* * cover the whole range: [new_start, old_end) */ - if (vma_adjust(vma, new_start, old_end, vma->vm_pgoff, NULL)) + if (vma_adjust(&vmi, vma, new_start, old_end, vma->vm_pgoff, NULL)) return -ENOMEM; /* @@ -731,12 +731,9 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) } tlb_finish_mmu(&tlb); - /* - * Shrink the vma to just the new range. Always succeeds. - */ - vma_adjust(vma, new_start, new_end, vma->vm_pgoff, NULL); - - return 0; + vma_prev(&vmi); + /* Shrink the vma to just the new range */ + return vma_adjust(&vmi, vma, new_start, new_end, vma->vm_pgoff, NULL); } /* diff --git a/include/linux/mm.h b/include/linux/mm.h index 294894969cd9..aabfd4183091 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2825,12 +2825,11 @@ extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admi extern int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff, struct vm_area_struct *insert, struct vm_area_struct *expand); -static inline int vma_adjust(struct vm_area_struct *vma, unsigned long start, - unsigned long end, pgoff_t pgoff, struct vm_area_struct *insert) +static inline int vma_adjust(struct vma_iterator *vmi, + struct vm_area_struct *vma, unsigned long start, unsigned long end, + pgoff_t pgoff, struct vm_area_struct *insert) { - VMA_ITERATOR(vmi, vma->vm_mm, start); - - return __vma_adjust(&vmi, vma, start, end, pgoff, insert, NULL); + return __vma_adjust(vmi, vma, start, end, pgoff, insert, NULL); } extern struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *, struct vm_area_struct *prev, unsigned long addr, diff --git a/mm/mmap.c b/mm/mmap.c index c10ab873b8e4..d7530abdd7c0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2268,12 +2268,12 @@ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, new->vm_ops->open(new); if (new_below) - err = __vma_adjust(vmi, vma, addr, vma->vm_end, - vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT), - new, NULL); + err = vma_adjust(vmi, vma, addr, vma->vm_end, + vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT), + new); else - err = __vma_adjust(vmi, vma, vma->vm_start, addr, vma->vm_pgoff, - new, NULL); + err = vma_adjust(vmi, vma, vma->vm_start, addr, vma->vm_pgoff, + new); /* Success. */ if (!err) {