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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C32DAC432C0 for ; Sun, 1 Dec 2019 01:50:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8636F2087F for ; Sun, 1 Dec 2019 01:50:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="r4Y6cg9/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8636F2087F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 318C36B0296; Sat, 30 Nov 2019 20:50:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29DD26B0298; Sat, 30 Nov 2019 20:50:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18CDF6B0299; Sat, 30 Nov 2019 20:50:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 02AD56B0296 for ; Sat, 30 Nov 2019 20:50:51 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id A03B62C7C for ; Sun, 1 Dec 2019 01:50:51 +0000 (UTC) X-FDA: 76214893902.15.side56_77a2195c135e X-HE-Tag: side56_77a2195c135e X-Filterd-Recvd-Size: 4312 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Sun, 1 Dec 2019 01:50:51 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5370A2086A; Sun, 1 Dec 2019 01:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575165050; bh=qelrs/S3JOt/lC9HVBfxAA60A4wAWAC9HBkcdS9kvu8=; h=Date:From:To:Subject:From; b=r4Y6cg9/GHjQQsHPjb20X4an4gvhqSqTN8Rw2uEfx2AeWGJohdFaLu4FnYu8s6LII JNj402E3CjfBwrx4GAzMDDHk5ldHr+Gish2m0AzVl+eN+hHdd1NjVXnf7VA4Dyqt3A DYu6V6Tl/FQOjRv2fSaBQg7fV347KyX8mmgeKYts= Date: Sat, 30 Nov 2019 17:50:49 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, hch@infradead.org, linux-mm@kvack.org, mgorman@techsingularity.net, mm-commits@vger.kernel.org, osalvador@suse.de, richardw.yang@linux.intel.com, torvalds@linux-foundation.org, vbabka@suse.cz, willy@infradead.org Subject: [patch 032/158] mm/mmap.c: extract __vma_unlink_list() as counterpart for __vma_link_list() Message-ID: <20191201015049.AzHxsc5Ok%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 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: Wei Yang Subject: mm/mmap.c: extract __vma_unlink_list() as counterpart for __vma_link_list() Just make the code a little easier to read. Link: http://lkml.kernel.org/r/20191006012636.31521-3-richardw.yang@linux.intel.com Signed-off-by: Wei Yang Cc: Christoph Hellwig Cc: Matthew Wilcox (Oracle) Cc: Mel Gorman Cc: Oscar Salvador Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/internal.h | 1 + mm/mmap.c | 12 +----------- mm/nommu.c | 8 +------- mm/util.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 18 deletions(-) --- a/mm/internal.h~mm-mmapc-extract-__vma_unlink_list-as-counter-part-for-__vma_link_list +++ a/mm/internal.h @@ -291,6 +291,7 @@ static inline bool is_data_mapping(vm_fl /* mm/util.c */ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent); +void __vma_unlink_list(struct mm_struct *mm, struct vm_area_struct *vma); #ifdef CONFIG_MMU extern long populate_vma_page_range(struct vm_area_struct *vma, --- a/mm/mmap.c~mm-mmapc-extract-__vma_unlink_list-as-counter-part-for-__vma_link_list +++ a/mm/mmap.c @@ -686,18 +686,8 @@ static __always_inline void __vma_unlink struct vm_area_struct *vma, struct vm_area_struct *ignore) { - struct vm_area_struct *prev, *next; - vma_rb_erase_ignore(vma, &mm->mm_rb, ignore); - next = vma->vm_next; - prev = vma->vm_prev; - if (prev) - prev->vm_next = next; - else - mm->mmap = next; - if (next) - next->vm_prev = prev; - + __vma_unlink_list(mm, vma); /* Kill the cache */ vmacache_invalidate(mm); } --- a/mm/nommu.c~mm-mmapc-extract-__vma_unlink_list-as-counter-part-for-__vma_link_list +++ a/mm/nommu.c @@ -684,13 +684,7 @@ static void delete_vma_from_mm(struct vm /* remove from the MM's tree and list */ rb_erase(&vma->vm_rb, &mm->mm_rb); - if (vma->vm_prev) - vma->vm_prev->vm_next = vma->vm_next; - else - mm->mmap = vma->vm_next; - - if (vma->vm_next) - vma->vm_next->vm_prev = vma->vm_prev; + __vma_unlink_list(mm, vma); } /* --- a/mm/util.c~mm-mmapc-extract-__vma_unlink_list-as-counter-part-for-__vma_link_list +++ a/mm/util.c @@ -292,6 +292,20 @@ void __vma_link_list(struct mm_struct *m next->vm_prev = vma; } +void __vma_unlink_list(struct mm_struct *mm, struct vm_area_struct *vma) +{ + struct vm_area_struct *prev, *next; + + next = vma->vm_next; + prev = vma->vm_prev; + if (prev) + prev->vm_next = next; + else + mm->mmap = next; + if (next) + next->vm_prev = prev; +} + /* Check if the vma is being used as a stack by this task */ int vma_is_stack_for_current(struct vm_area_struct *vma) { _