From patchwork Sun Apr 28 10:06:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13645977 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 CB7BFC4345F for ; Sun, 28 Apr 2024 10:03:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DA446B008A; Sun, 28 Apr 2024 06:03:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 486DA6B008C; Sun, 28 Apr 2024 06:03:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 326FF6B0092; Sun, 28 Apr 2024 06:03:21 -0400 (EDT) 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 135FC6B008A for ; Sun, 28 Apr 2024 06:03:21 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8665E1602D8 for ; Sun, 28 Apr 2024 10:03:20 +0000 (UTC) X-FDA: 82058502960.05.645CD53 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 00005C0018 for ; Sun, 28 Apr 2024 10:03:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KO5K1UOv; spf=pass (imf10.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714298590; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=JSrxJj62mYg3e7qfKz/0h2H2L9PblZ4aheMBBURYagM=; b=tPP1MbyOSfKI5MO+3wVOR4Y8ovw+bwCBdFXCM9yeTw/Bml2RwI5XJwTLoLr/gv/8WBL2wK B4ORKh3MJjOl6XAggUy+JLJ9MpryiRLlsKEVaMrMnSIieOowTxTsSgKdSHOshhHcjxlxvg h0n7WSS11dxhHEq5+PxwQMDmkGEGqiM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KO5K1UOv; spf=pass (imf10.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714298590; a=rsa-sha256; cv=none; b=RwudX0szuQY+aoVgxcNPEnaKD5Jf5asiqjawvbeX4tltJ21EOumzMfCBMWG4eYf1Bxo2aV x4c4Gv9Gndi5WTxWWpNX76P3i8yKpoX5RVSBbjpkPGVtLI2XVGqg63et4COefsz+BvztKW Sq2Tp1GHkrfFPcDXHdGdq+2UDXxn+cc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0F8D960A29; Sun, 28 Apr 2024 10:03:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6276BC113CC; Sun, 28 Apr 2024 10:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714298588; bh=Uzl73+0oYcqvZx1LI81e5vJnRXOSv47I6sL1y4jODW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KO5K1UOv2oq/q3c2ouC7bsIp40DeLYo95z/jC2RvcvRtkLvS32NMSVxDRoIH3yH9O Ah9ULQOgyIMFL0Lg7O2uKT7+bUkojFyvyVqS5myzchwzmGedUOQxXhVk2Lo0e4q7YV 3DNhU5ldZhc9OZcfcgcnHJrQZ/LH3dE6fZ2YX6IoF8uPahFswX6BdI+DS3vIk0pnys R65yImyWxmwwxH6kOOw7I9g+tKMB9hJoBJPRYMiX73kJLxz3WdRHLHrejMYJfHwS/u Y7DZOxGAF8OuDNeAw9u0duoiUV4hc8uiKohzWRiYk8s+tnOncrcwyox/MHBnr6voD3 023S30vVPlv4g== From: alexs@kernel.org To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, willy@infradead.org, izik.eidus@ravellosystems.com Cc: "Alex Shi (tencent)" , David Hildenbrand Subject: [PATCH 4/4] mm/ksm: rename mm_slot for get_next_rmap_item Date: Sun, 28 Apr 2024 18:06:18 +0800 Message-ID: <20240428100619.3332036-4-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240428100619.3332036-1-alexs@kernel.org> References: <20240428100619.3332036-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: q47bqdr5ufqtg6oek44f87h48tjxfpds X-Rspamd-Queue-Id: 00005C0018 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714298589-973043 X-HE-Meta: U2FsdGVkX1/fD7m2PLxSZIBF9Hz7CGXLxXHct8lHWWawaYIusOKBBSxJBCxXGDDB8qEwpb1PQsr9SIF6348LmKjtGpQEc5fWECs4xyUAcQTNW08uEw+Y4RsPZpWJnr009c8WgBYSxAnLyELo+xYgRAWgpCF34cyDj2ZkhrXGpJ5QjCLZoI1Ux/HnQcWydSh6ka2WBrTljDPcpUj82+Qcx3sxViOd2yJMIr3ufeivOz6LTnuO3TKTVnkyYxlUeJdOzIJH5RqDZXLcKfgrf7TukOh2rGMZy3hOv5amHbRbnNlKWdd7VeFsuhneK4Z101ZZmSj4HM2x5EbHYo6oQ46v50U794TyUpemQ7iVOXmwJtsjLSw0Q0HJfo/v8O5LirPL14vnRn/ODp+aZf3BE4rn13wlL7DGDYepmuyYZiVyZ/u6Jqr75FeVPSuMbqHz+czCOcfm8/dfiGL9vBELY4MHLM+3aNweDonDgrWzhuasjMzC4ZJ4YEzu6h8wbiid37WgkDHmjl5vV6q6ByLkfWFAWSIvpEHpI+TsB2tY7ZKPIUiqbAwqbZfRb1yR1MQ6PawdT8K5TMfhBjohmH6hbKCJjYfAfebGasWDerXbTf9kbgVLd9K+vPvdbQPaNONdAKVCV71MATrIudsXC8W65WwoT6luoa9VEgcL0A9Py1H7Mvc6UDLkuahypikZh+D7Jll7DRZOZxnRAYsNj1gPi7hAlGYfeJ3GPsyMvzzf50CLI6iaVJFqoIORcN7vvCvVvX6jLdE+On4u3Engf1HWKZjfGTyE07aZHqqUCPugQbkzCMCbrlRm59jK9FfWisqiyx1QnWD7AEcDjEdxmR7UgB2Z195lXF86RUbtyqFlNxbz4ExTwOHFEcSNRuGVUC5UpVdO18KsI6lIrObz7z+5TsbW+EyA3oe74cqy8m0lBScZTMzyjeqkCU7Whp2eB24DiXuhyK2sjI2vmkQorbh86iV VoEyh2re Zf4cZIkIq69e0kje3VRJ+UlV7XasL796ulFR1tD5nCcFfq4ISlIjGqMlsY5aOxg7oeCODb5FoJjCzlSNSNCqHkm79uhpsLSZt0rfcymxuRLzFrbxzbuS0lGb9K0fNohaRPFi9Bjad032vv7hZcisFKpU60iJqTG3uFFvTSoMLRLBfKs7eOJO7i9NFCqVLWzUv0zfRPyDRDUFp6p2MOWsnD9tFSnUTLAKzg8iGOeDvvUvwTW8o5SSMBlunt2KYSu4qGIfiCCWi3HNPvLJufB8phmrgyCRBA5G1IuEkF3g0jeDzfn7F4n7aKPv5Wg== 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: List-Subscribe: List-Unsubscribe: From: "Alex Shi (tencent)" To distinguish ksm_mm_slot and mm_slot for better code readability, rename parameter "struct ksm_mm_slot *mm_slot", as "struct ksm_mm_slot *ksm_slot". No function change. Signed-off-by: Alex Shi (tencent) Cc: David Hildenbrand --- mm/ksm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 22d2132f83a4..2d10f1aef123 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2465,7 +2465,7 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite } } -static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot, +static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *ksm_slot, struct ksm_rmap_item **rmap_list, unsigned long addr) { @@ -2485,7 +2485,7 @@ static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot, rmap_item = alloc_rmap_item(); if (rmap_item) { /* It has already been zeroed */ - rmap_item->mm = mm_slot->slot.mm; + rmap_item->mm = ksm_slot->slot.mm; rmap_item->mm->ksm_rmap_items++; rmap_item->address = addr; rmap_item->rmap_list = *rmap_list;