Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp758130lqa; Sun, 28 Apr 2024 03:03:47 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXww9FpOnq1h9l65eL1xZcSQBoERQEK9YFYcnpMvjs0VV2N5AZq1b+E5jGjV4NcFWB1QSZjpNWSRnwiDxRl4kS9uwTVIpkoE8/HhUcfXA== X-Google-Smtp-Source: AGHT+IHxXWJxWhJiuBx0WKeGP0QGTOrQICFF0I536xuFUqVoOZkvrzDDOgE7stLhTsHuTQPMgAot X-Received: by 2002:a05:6902:160d:b0:de5:5647:c87e with SMTP id bw13-20020a056902160d00b00de55647c87emr9029987ybb.33.1714298626956; Sun, 28 Apr 2024 03:03:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714298626; cv=pass; d=google.com; s=arc-20160816; b=pniHyBOtxFLuB8N7LHBjliuryvLr6bTlkn3FNpyePf9M1kVEJr44yywACtA5GTfsE3 9K31dnCr6QiE/S1rB++Lu5P61xwNWWbKsk3zVP9cm2Qt6lcrtofWvw638GEW222yaeOB xGmYSA+5KZeVDvwsCWkI5wSR6a0Lf0k5BewuD28iQ8vdXrytZx9vM5AAbPTAS41WTvY3 6I//UsEhf8ZadfmtG6Dn4+hC+Hu4fv5E2RdJSKJ+erwRlJOMyvvdoRYNaBJ/PaeeHDUj JzqVN83Y1lSxG+ytPHHTO0lH7LNkClN7YMII9NAvADUSxeLdToFbregGMGXhnAKxd+VB vhvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JSrxJj62mYg3e7qfKz/0h2H2L9PblZ4aheMBBURYagM=; fh=66y8TjqlTIovB36s3QsxghJVcGw4o3GMc2DsEpAcBGA=; b=sGQN6+rJEHULNpLRzjIPexk6i2qL+a7VxV9sucDtQNHo19fCNtCVzZMvaNtK8VdaaT Q89XQsI5cPK39Jtn4qBXXDeze+sIFUUcm9KXYWYsRtUJpwKTAUGLw/oDiwKJbt8g0xH+ CNaTwGeJmhmJMsqEC6T4frMvYjhSD/SW97Fr8f/PHspQ/hIK8cm5tanJweFvMasy388B kNJ+fPIrdDOI5y32Rb/icFoQ4U23RLEXCP1JzhLzoA7RKM3VOi+oNz7VaugoVMkY1tHJ gh3VkV8wfLf7pD58RTbfEYkyRMIbGzLw3JT+VTMyEtd1DP2Qa8b8/wmn9t+CfcvgN2LX zexQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KO5K1UOv; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-161359-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161359-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id fi7-20020a05622a58c700b00439b3de82c2si15682644qtb.412.2024.04.28.03.03.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Apr 2024 03:03:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-161359-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KO5K1UOv; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-161359-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161359-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id ACCC71C20B9D for ; Sun, 28 Apr 2024 10:03:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F347E5A7BB; Sun, 28 Apr 2024 10:03:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KO5K1UOv" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25AC85A0F7 for ; Sun, 28 Apr 2024 10:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714298589; cv=none; b=VNw0caGNrhBpfI9i15DZG1Sse/oGCG7obwwKZ0wQfb8mmv0Sl/6f17EbWzUGu9FJe6Tdt/8h+UV27M778fwsQ1ua3jSE7mIq5VQIqsAPg0rfA4oAvTLl7bWVcw7LamkDjYAm6oUBWAOzCC4ckp5BS6FKArdy3HfjayRjtLwbgTg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714298589; c=relaxed/simple; bh=Uzl73+0oYcqvZx1LI81e5vJnRXOSv47I6sL1y4jODW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GVQDjIKovIO4kGj7CQZPrvHjMTYb/0dus1m0rGKMOrsG6JK7nO3k6pOXjFDHS9oUWLACSHuwTIxOZT6cgvh1x2a8+rukhtCnNcS4s0kfFw6RIH8zZ1vdR5ET6n0z34kLsDAEdbxnDwLEXT/v5tO1vQt83WjaD3BF9+6k2zT1kaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KO5K1UOv; arc=none smtp.client-ip=10.30.226.201 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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; -- 2.43.0