From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5EDAC636D6 for ; Fri, 10 Feb 2023 00:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230380AbjBJAwr (ORCPT ); Thu, 9 Feb 2023 19:52:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230359AbjBJAwi (ORCPT ); Thu, 9 Feb 2023 19:52:38 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9576E6D8E7 for ; Thu, 9 Feb 2023 16:52:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 51F4DB82395 for ; Fri, 10 Feb 2023 00:52:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED080C433EF; Fri, 10 Feb 2023 00:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1675990355; bh=phytXArpJwIysYmRH4O3j37PsLtYpOE20N3oodgzvhk=; h=Date:To:From:Subject:From; b=08U8Sb4ce+ZkkB/6CFfl1BreIcjokLTy+lG9+aKfzaH+xaovBKJkvonl/G1mTqYIw NmwTGYr7HFpV7S2rAR66QXaksk8ngAXvGmWUdLX5DjLSKGtcvmPxjhclOEFCsjFD2+ RXB+5CvYJwc0GocCtoQYspd2VeysSyRhSKGIm+EE= Date: Thu, 09 Feb 2023 16:52:34 -0800 To: mm-commits@vger.kernel.org, Liam.Howlett@oracle.com, Liam.Howlett@Oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mmap-convert-vma_link-vma-iterator.patch removed from -mm tree Message-Id: <20230210005234.ED080C433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mmap: convert vma_link() vma iterator has been removed from the -mm tree. Its filename was mmap-convert-vma_link-vma-iterator.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Liam R. Howlett" Subject: mmap: convert vma_link() vma iterator Date: Fri, 20 Jan 2023 11:26:11 -0500 Avoid using the maple tree interface directly. Link: https://lkml.kernel.org/r/20230120162650.984577-11-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Signed-off-by: Andrew Morton --- mm/mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/mmap.c~mmap-convert-vma_link-vma-iterator +++ a/mm/mmap.c @@ -487,10 +487,10 @@ static inline void vma_mas_szero(struct static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma) { - MA_STATE(mas, &mm->mm_mt, 0, 0); + VMA_ITERATOR(vmi, mm, 0); struct address_space *mapping = NULL; - if (mas_preallocate(&mas, GFP_KERNEL)) + if (vma_iter_prealloc(&vmi)) return -ENOMEM; if (vma->vm_file) { @@ -498,7 +498,7 @@ static int vma_link(struct mm_struct *mm i_mmap_lock_write(mapping); } - vma_mas_store(vma, &mas); + vma_iter_store(&vmi, vma); if (mapping) { __vma_link_file(vma, mapping); _ Patches currently in -mm which might be from Liam.Howlett@Oracle.com are