From patchwork Thu Jan 5 19:16:05 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: 13090472 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 D2DD5C3DA7A for ; Thu, 5 Jan 2023 20:59:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DE5D8E0002; Thu, 5 Jan 2023 15:59:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38EAD8E0001; Thu, 5 Jan 2023 15:59:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20A458E0002; Thu, 5 Jan 2023 15:59:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1457E8E0001 for ; Thu, 5 Jan 2023 15:59:42 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E0FF814046A for ; Thu, 5 Jan 2023 20:59:41 +0000 (UTC) X-FDA: 80321961762.23.10FA931 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf21.hostedemail.com (Postfix) with ESMTP id 836E01C0014 for ; Thu, 5 Jan 2023 20:59:38 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b="AqnUsF9/"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=tb61EsKr; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf21.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-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1672952378; a=rsa-sha256; cv=pass; b=wLV5Yk3EMCw7ci9k/ibBxmxwPdEd9CHVbuWK6oLwgQkJ6dvpW/q19oB5GOAvJd+70mOXlH ImWCxh56MPaNZxq0KTifijIZuzbM8TWSyQ7gwIS17hqFbQLajrcrkhFS87JosDxDh7NbFV y+j9q5Xi2yA1VdAWsVd8wpLL+duuJJ8= ARC-Authentication-Results: i=2; imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b="AqnUsF9/"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=tb61EsKr; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf21.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-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672952378; 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=HmgkQ28QOz7ZNEWXunztBpLVHZCE4edNWbiYOCDwRN4=; b=aagPoRNc3gMU2WgKsoEqoxoeS8gP3zfEJ4IKZSxIsejpD9vBziwGSX15KSrbCx7/lPCE6k N2vXcBJvpxZJLIq3bF+fQBnzpQygOXkTXBsGYqaWHotObnkJ6Uw693MGNdCaJbV8MoxPqq kodBaybdyMHq/Aek7Ndv7AguP1DjmWI= Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 305IUIHr030165; Thu, 5 Jan 2023 19:16:48 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=HmgkQ28QOz7ZNEWXunztBpLVHZCE4edNWbiYOCDwRN4=; b=AqnUsF9/fDFRO2iJ5zTt9NftNr44FpFh5qvjKPRUH6+7GoE5fhCJAfk9YI/2prpxmQqx +PTjjBSkCJWGqzyIg7QnOj3jGnruSfH98KzX5OIyBO3sCnTP76eEcamO0ABcYKLTkBmP 15uJw3GZsOY0QoscoIBtQTajafbI2xi2hSEjxlwY3siuBm5Z+ekgEmLH0A8vgkpFvjEb 4da1l7oM0fpLVaDgL8/iclD1SeaV3XAKtZhV1O7xq9Rshorr5vr7XJy7WMG2dVYwxMRJ B4L5tMlSp6E+FvRiK2/A6b4L4QgK4zxdsRtQ5xDHgFhkyrZWOKH8TPsTTrEi2HbDilmq /w== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mtcya9kby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:47 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 305I9Tnl012151; Thu, 5 Jan 2023 19:16:46 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3mwdf0u4xq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjxZ1cUhPPlmOs139rSLWEnAxVmNBKTQtfDvzB4TjHjGhkdehVx63Q/WfOAS7foCJP09fNYtg8dCQ8NRPzbKKHL939ahf2JFPswWHozIEedj76QXDcJ7st/7rAAvwJNK58cjuY6w6oi3M+SYl00L3d0rp91bnKir9dH0LrjzF7NF4kBTZDpCq+I2EWp3cRrrZVgKbzdj7uvkMpn107iK1jQ2YpfeY1Rxm47VznmKDZ/XuvuYACr70VBckSbqzzFLzGrXcdI88JmZUeTq6kQccfbO73OSQgGNkGPpO1+zlE8y/YmCsKvjFZAWAzMRI68T++c0R1XJgCQlyUtXtAQiEA== 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=HmgkQ28QOz7ZNEWXunztBpLVHZCE4edNWbiYOCDwRN4=; b=Vi3DXD+LSevdTJXjJCAWHJoTD41L+UEd69rlKNR4KXigaSQc2nvM6UnYRZb54M6FDai+IvF+a81IE3lsjZRQ4Zk58G9rc4Q3hlKgE+R84Kd0Lc3NmQY67xmYJEzp3MeIb7ijW7vPRNIhFVHUCQVYJvNrHPGvYx106HFvew5cdFbdBXYQajWqDgUwGCavhAGGSd/32B5rE0LVSAV903t2xKkMrSk562RN8Mdm4ZxJhQrKjOrDT+Sbeew8LrvWNlPR5Z5VxUv+QQFePEBPkVWPWbvpT0F65CqrCfvzvPKiZgC7qRmC5mEhcNIYn3esaKiRfjMwCcJXp0i2FKEwCNa7FQ== 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=HmgkQ28QOz7ZNEWXunztBpLVHZCE4edNWbiYOCDwRN4=; b=tb61EsKroFQuZKrmVIPalVwLgY3JbOEGBfqayJQ7Z74y0lGgZ/rjp5mOLN/JZtRBgbDESiMkpRwDihoJLViGa3Rybmup5rMccPL1lcvBPTIhA+OqD4e20mySmPp/thNM2Tg0bLOzfwlimkVXwWyz/UMF+cze0y7L4QUtena4+eE= 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:42 +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:42 +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 44/44] vma_merge: Set vma iterator to correct position. Thread-Topic: [PATCH v2 44/44] vma_merge: Set vma iterator to correct position. Thread-Index: AQHZITooJ+5o/wSJjEyVNtF78Sn/nw== Date: Thu, 5 Jan 2023 19:16:05 +0000 Message-ID: <20230105191517.3099082-45-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: b6b76d5d-a603-4a8a-3e11-08daef516126 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X/R2plOro2MLTgv/Vp51QKSPAQm3SX4IsaNaW/9PF/Ur9m2xeaNkkWnpRyO7bdG1SW+zqkRwndTZMIKDa12D8NyYNKx/FyqMrZiJl836v7oMjlt4OzZLR5VCknselm++OUYj/17z6e4RkMzpoc4A8O92SEgZPP+RN0LwkyE9TCeyJjolrtzWFXmDB/vk1l8xDPI7usSZH5A+YkShbTitqn2FEKbaR8HkoXFVw8h9oAHTJoeDkLk+u3RurbhZ291kFmHBry1+gtlQJp4AMyaTYFWleXSLRmbCwD1LX0Zz/gedjW7rR2cpp67Dg7MwEiu7YPtki+zF3QBaL7+sEvdNwO4sZ2Smf1geiSxxlmP6jywUzIZeE4qNmzoDmcvsHZzJkF9BAG7KhoaaN5zd/mYcVDJ4d5DJTOhp1Mo95hJ8v7f/sqvaISto2iON4xIStntmowvR/30OdF6u3dS6t6D/pwD9H79WVLPdE7Rh0pZfeE1T0NZYR3TbF0voR+DJaNXSG4Mi9ePSl45AM79ftXm2XpCiqCXeI7wgLRM+ZKfwVSZCk4NBXxwxoT4ainpirREQrNp1xbgcFroz30fiiU1l0dheR3ut1UjrxeDTg7Bp/Xqrxbu9LtRp9eIyrZyST4AiOHzUyEEWJ1My2BL1Hg7zpWx8akXgC6atGg3onQxkXKJt7E97+XaRU937pEL9DhcMp2ZhsJwdY+9krRvRrUszcA== 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)(4744005)(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?nNh3q6fryNVL+2L9Vi7PLPp?= =?iso-8859-1?q?JjwwpJxOVNCRz3ZjDu4cr3uvk8WA7pmrd64xBNDxtxwAAKqlzsHEVu7tOj/M?= =?iso-8859-1?q?YTzMhV3GGxKpIVYT7jpnRxhPoNR1c54XbeKfZozw1nWYskjXVcoF30Lqix4C?= =?iso-8859-1?q?jqagiWxxpmDwJXAiIjEDpOzbTS2AmhNoghA+wplxJq685uPi3gMdkQ/14Cl7?= =?iso-8859-1?q?RJABWJLBO+vSfdkbbWopBWrNb8v94L+/fWuo2abnmwDQ/7uZ9RFb3Iv4+pCE?= =?iso-8859-1?q?DXB6qthy4mya/BSzh4HUaRavycqmHrlnyswPOCvcf+a0W/564LDeVTIzOpaF?= =?iso-8859-1?q?6UUtU1Opt7r9ICOnaDh0ESXSUz+ehpfHCQkj5Vw9se4ZSYe0U2HBT2RrilWw?= =?iso-8859-1?q?XqH8Bb55iHL+fjdQeCUVyz51jGGkwAcxhsbrrVpIqT4fS3qlSLOpUQHtIi6I?= =?iso-8859-1?q?DYy4WjTvxr7861QOYz6+MsWBqZza8fdSnHn+cWyvaEdviwDA1Ll/xz0tBjgz?= =?iso-8859-1?q?IRoFUCmBA1soRXIxHh7OnUYnNl5YfanTcsEF4673zg7VMGUbCVsHkX5Lhm8w?= =?iso-8859-1?q?OkQbT0WnAbw1GNahgO6DC6SjXrA1HTRrb9xFI4Q8JtRjkxd9X5x7thdQu/vq?= =?iso-8859-1?q?ikLPg3i0ZSRBcg0XK+xKuGxgrtJ0VDXWDHKJd8/sprI94z6XSONalKLEi31K?= =?iso-8859-1?q?yyu9fE9t/gtVlSg9rCoF7uuBfv7q8+lE91LllIw3pTTH9BoxwQQ3HX83wCHf?= =?iso-8859-1?q?Ex1o+kZbrfiKv9hihf3jYUiBoz1aTINJyAPYGMhruolgyXPdeYB33ymZyQ0q?= =?iso-8859-1?q?uBmZxruLICyOy/SxaXjfdkogaelaHu1cDdTAXVNoVSMHR/z3rMwWk4DtkxTb?= =?iso-8859-1?q?1+Nha2H2lh4Jq5Wkg4boEY2ZXVTc3gabpX6aNLpJJ7MQPrSsJxcgLoGb0i1W?= =?iso-8859-1?q?ndSipdT4UCxdsD1yaZGwvTJcX9lYNcil6LQdduOelUwJAp9jdet6/1my1aFh?= =?iso-8859-1?q?MRbsXcjmKK4ZHv5bPogehW0GwkvxmcTuFTadEWNy103YdXz+/hGv5+1JNaJu?= =?iso-8859-1?q?IhRQvMBULYai+Y4VQT4ePhdKLotK9tLUMMf8KkVm+5KzqeiEJzGPr6EbI2QE?= =?iso-8859-1?q?LJfBLc8iJgioavagJOIsgMv5maNP89P12eG8cEdjUupjlRARwNUnxA06zQDq?= =?iso-8859-1?q?s4pClKDS1yn20PPrFaRoEw1hiOPqreCwCvExMdYkX5l62g+SGnLH4EochGiS?= =?iso-8859-1?q?8BFjqQf/4T7N9oUQiRg6xiIdqXWlabV6Qymow164tFbI1wwvhCwf2U67vrsI?= =?iso-8859-1?q?oh3c7awy+SzLnVtD6wrLglaAwdXCqPEZPY9aAXc/sa7UlEejpHhefxO0qXH5?= =?iso-8859-1?q?Z6Esee5NlJ9Y0Pm+Y9uQIMpodh06tn+auBLfBEH/Q/XDMkExqBb4eqTLbgGH?= =?iso-8859-1?q?RgrcjA5qJrcc5tlJIrn5g2QdaPOaugUgB1t+CRXgIiTptKG6YDgDXvjbazzG?= =?iso-8859-1?q?hiYnJAoF32wAbdvyeN8aB2tBiREPa//HsTHlsMgk6WJWa0v00xR+NFnULfXn?= =?iso-8859-1?q?JuNZojvGPLXxOVpLJoQViCbzsS5z9X2DOJB/PHDxlVqgZT0DQgUm5J2O2Esa?= =?iso-8859-1?q?TJf5JGrLWiMcQ14ynhgpEZ8MJXUZVgcBYgQIEdg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: b6jtqnsv1QGs3MLrPde6gXS7gBVSRNOOFd6seaz1xtOahP0kV++rekhtWZ3JnobUV+ka8jEWx/1Lj2rdLG0UBvD1eu8GbqRLjdNETQ36hnHQQRpdL3kACLM5NO3VMGfnDGlVvTsIiOq4zRP60TMK1cgNPILYcoBym9Axhp8Ll5tg8MuSGgQnC+0t44qm9m/0lDsMXfd3nfF5KJAsd+/MS2UJ9mZaSZWQkFaGaJSWr6ZP/1Q2gSaBg2OIWkt6L9ZRMIioIOz+2PCh0+PUUwO9ReyLbzjkH+uZ+vTM+XzblgEeqWxDjdjrIZ6e9n8VzILfsytByfm2xmCBpT33uKDinO8S3fDaVLpFyF5FwEyaMFU4J24xzLXIekw8PN3Y8OhL9nZEWHVdYTJ2kdq0jugLZMBKi/mmQwSrgm21/udHDUyehK08uupd69EkUkS5t2whHyanwXg5w+ceoCWVLFBF10e4gLXK9Mq4qPneDQ+Rp1Anj9Dc1M/FCaUEozFuqli00UwztBsLK1uyAxpU2c+Ak0qhHX4HUYAO1xuhAyuxNJu8rCvLOU/N/lIRaD2Pk2lg9jCAvrhDq32TkGpOTgdyyLGcSrNh531MZ+oynIoZ35xeMm4z8bYRGnq5FoiarLX0PvEWRRtONhjUW4aewDyrhRe1MRTK1JnC0gxfXT5Wyse0aYrOfLuBHAR8q6tXdiDddFB4ZuNay6NRZUXySlvUYSRYk1WA/ezS2EjuBkhsvmJPAYqQUR2vKpfrcr6njiw7mRTdrhvjumcuuO1Ur0wEpwnNNCuKz2IZB0HkaxyeWl9ZkdQvEd+/YaEu5oNebNGDyVmeN8ynjs8o7uAi+vIHtJdLslp6Q9IiEeR2gpRDo55jceCYROlGiH/EzepN5otl0Av34TAFL5jH43lq+aJ2vA== 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: b6b76d5d-a603-4a8a-3e11-08daef516126 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:16:05.9532 (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: a3CFjJ29dxSN4AcYdVf4icMEzoWkBtxp8J6j7ryZ3J/SuL6lzPh2OXvQbJhiH5OPgQZgvhAZJ9AHIymQcyNfKw== 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 bulkscore=0 suspectscore=0 spamscore=0 mlxlogscore=977 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301050152 X-Proofpoint-ORIG-GUID: CjCJIEYrWf6fG-MX3qT4maONUya5GcQ4 X-Proofpoint-GUID: CjCJIEYrWf6fG-MX3qT4maONUya5GcQ4 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 836E01C0014 X-Stat-Signature: ntjnja1pcowzphwps365ahzgrsx5k5hg X-HE-Tag: 1672952378-748754 X-HE-Meta: U2FsdGVkX1+rsOu00wRHsoFQ0MslcFlbIx328ngD+WdZ+BjWhdZDzgX0zxyAZbvtSXwXRtAZNTYnQf3pe2/Ix/2g9mvPIuepQA7S5J7TV/ENe+mw2djeUnfRfyeU9F0E8nr0NJGoOOGT7yI9NpveGdiz8P65bCrxH7H0UrxBH3TAyOMBFbiX8tzHr8iWjapBOQlsxVbsd9kSnXE4ZGu+1iOCpoimOgyxEDdWNhsHvaogxrIzXe/djWBdPuNLcap7u6s5+Q990t8eKu1Zcv0F+GaOl5H6Vv8qXSbyOaJNd753qJsAkvPU36KEyx9AoaXk3I2MJO/Rm3poDCnt/HksXqp6nPjQJFS+jo2tJP5jRzumKBy9XAtL0n6QlJ9dyjE95bi/PYUHtsWDH8CxvEOK/Uwt2VOW5H12nRQa6SNHKASBk3eifhBAkK12p1RsBuSeCBPTKJUcp3a1sXco5Lb2RoXz4HhM83uvrnSzoUdk700wlHPD9fis00HVEy4P2EIrrSXBWdN+SJ/cYrFaiBEpQXPedWlVO/sbi9LNZMrZJMnGcZqVnNB5O/NgrsCktfyeE5LjaTeqJaSvHwa3gUtPZi0FhElA/PaIPeyYQdqgQhxwtO6aFxP2/Dv02yQvWbDx+snZ5yUe0RK1maHHyFlUeHGHHoGAg5ipyWCQkqYklhlU6PIOnOzFt3CbxBmy+RoQz7+DwFGwz/KTuA3ScJEaRiiU3SBcRJf2AgVRZWFBji4NdTVsd2TGSzfEfYyzN/fn2Gg5QszL1lvesAa4kh/LIZI2gqvdk6ubQqSKHgYV4YikVEQbDk+mbCIGqoHsSkNjyAPuJSGBypAJXUjVXbOCrOxcN6uRK9Nay3Mvzqz0y1gvYcw9Wf3w9d+3PwVId/C0/0hP5NaEQrwWHUK7rl1AYqED/UtjUPshvIEIda9xp0HOdtUrxO04S9nc/nZIBBEb/ku4BBRB6YC5QOD7a1r t4RE449n qaq3WXd824wZGUbc8HhlCKiJuCKSR/olid4nFTMSk0jH+U3x9yfu+1tOBYMKe2Ek72gyX4u7cHwqkKbjfU1wpEtxbJ32TprY88Lfz7wdibDYZ+y9xjE1Oy9kfeQ/VBT0O3/5HXZG4301mgMd424DCEuX3DQ== 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" When merging the previous value, set the vma iterator to the previous slot. Don't use the vma iterator to get the next/prev so that it is in the correct position for a write. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index a8dba6b6c34d..66e2f1b88c87 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -994,6 +994,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, && can_vma_merge_after(prev, vm_flags, anon_vma, file, pgoff, vm_userfaultfd_ctx, anon_name)) { merge_prev = true; + vma_prev(vmi); } } /* Can we merge the successor? */ @@ -1085,9 +1086,6 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, validate_mm(mm); khugepaged_enter_vma(res, vm_flags); - if (res) - vma_iter_set(vmi, end); - return res; }