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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDA3DC433FE for ; Fri, 14 Jan 2022 22:09:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DBD7B6B017E; Fri, 14 Jan 2022 17:09:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CF8AD6B017D; Fri, 14 Jan 2022 17:09:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B231D6B017E; Fri, 14 Jan 2022 17:09:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 9E9C36B017B for ; Fri, 14 Jan 2022 17:09:50 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 5E3551809A350 for ; Fri, 14 Jan 2022 22:09:50 +0000 (UTC) X-FDA: 79030285740.04.93C731A Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf28.hostedemail.com (Postfix) with ESMTP id E3DB2C000F for ; Fri, 14 Jan 2022 22:09:49 +0000 (UTC) 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 17C1EB825F5; Fri, 14 Jan 2022 22:09:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 936EEC36AE9; Fri, 14 Jan 2022 22:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1642198187; bh=vc1hBj5TydsfWWItX3y4oi2NRvlqaxJOEeG4Ak3AMyE=; h=Date:From:To:Subject:In-Reply-To:From; b=ZF/NUC5iIsaX+0YOAh/LLDjN0ySgpdvqj+TyXD0hjeY0YZX3VG4A7zK7vPwJcvAXr mySzKXSaqCHxAPyWpnVvLkDtQiX3iLuZR8kqI3jr+Biyf0JIyWeyzDVLhUo6Xm6lQJ yLookao6ObrxjXiNSBO5HbnsH37o7xTs896FW4S8= Date: Fri, 14 Jan 2022 14:09:47 -0800 From: Andrew Morton To: akpm@linux-foundation.org, hanyihao@vivo.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, sj@kernel.org, songmuchun@bytedance.com, torvalds@linux-foundation.org Subject: [patch 125/146] mm/damon/vaddr: remove swap_ranges() and replace it with swap() Message-ID: <20220114220947.nloFzSIKt%akpm@linux-foundation.org> In-Reply-To: <20220114140222.6b14f0061194d3200000c52d@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E3DB2C000F X-Stat-Signature: k9pjwryugw7rwi7dfrzrn5dkswsqhk34 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="ZF/NUC5i"; dmarc=none; spf=pass (imf28.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-HE-Tag: 1642198189-93892 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: Yihao Han Subject: mm/damon/vaddr: remove swap_ranges() and replace it with swap() Remove 'swap_ranges()' and replace it with the macro 'swap()' defined in 'include/linux/minmax.h' to simplify code and improve efficiency Link: https://lkml.kernel.org/r/20211111115355.2808-1-hanyihao@vivo.com Signed-off-by: Yihao Han Reviewed-by: SeongJae Park Reviewed-by: Muchun Song Signed-off-by: Andrew Morton --- mm/damon/vaddr.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) --- a/mm/damon/vaddr.c~mm-damon-vaddr-remove-swap_ranges-and-replace-it-with-swap +++ a/mm/damon/vaddr.c @@ -98,16 +98,6 @@ static unsigned long sz_range(struct dam return r->end - r->start; } -static void swap_ranges(struct damon_addr_range *r1, - struct damon_addr_range *r2) -{ - struct damon_addr_range tmp; - - tmp = *r1; - *r1 = *r2; - *r2 = tmp; -} - /* * Find three regions separated by two biggest unmapped regions * @@ -146,9 +136,9 @@ static int __damon_va_three_regions(stru gap.start = last_vma->vm_end; gap.end = vma->vm_start; if (sz_range(&gap) > sz_range(&second_gap)) { - swap_ranges(&gap, &second_gap); + swap(gap, second_gap); if (sz_range(&second_gap) > sz_range(&first_gap)) - swap_ranges(&second_gap, &first_gap); + swap(second_gap, first_gap); } next: last_vma = vma; @@ -159,7 +149,7 @@ next: /* Sort the two biggest gaps by address */ if (first_gap.start > second_gap.start) - swap_ranges(&first_gap, &second_gap); + swap(first_gap, second_gap); /* Store the result */ regions[0].start = ALIGN(start, DAMON_MIN_REGION); _