From patchwork Thu Jan 25 08:14:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13530196 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 EB8C8C47258 for ; Thu, 25 Jan 2024 08:14:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A400280003; Thu, 25 Jan 2024 03:14:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 653318D000C; Thu, 25 Jan 2024 03:14:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F3C0280003; Thu, 25 Jan 2024 03:14:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3A2DA8D000C for ; Thu, 25 Jan 2024 03:14:28 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 002FDC0387 for ; Thu, 25 Jan 2024 08:14:27 +0000 (UTC) X-FDA: 81717121374.10.F7371CB Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf26.hostedemail.com (Postfix) with ESMTP id 5B528140002 for ; Thu, 25 Jan 2024 08:14:26 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uhv8bF7V; spf=pass (imf26.hostedemail.com: domain of 3YRiyZQoKCI4G6A9Gsz4wvy66y3w.u64305CF-442Dsu2.69y@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YRiyZQoKCI4G6A9Gsz4wvy66y3w.u64305CF-442Dsu2.69y@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706170466; 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-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=TTmwN8C5xYYKtz8HRfXOUdRFW/9rByTcl8wDVg46w14=; b=z1QVEKUPAoVbtMIU0FEr2anSOIoMRc2lCluUziIbuhm2wm2bmC5B+O0jlDKr2xlCeOQPJs MyYImp7+G/frG0NtjUZreG+L7TJSE8EOcnNQdkcdjEEqhMdXtD5vtAcg37Eo7WbAIkEMzb JZ2/IvUwY9Y6nK8Hntt1se2XsuXU+pQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706170466; a=rsa-sha256; cv=none; b=EIRNMLi6LOB21YECBo6pununHLOEOJlxxS9vV9JylYz8KAXRsZvSZVFtxuSEkxO0tQ93TT 9yQnRYG+M6rrfNN/kpr9DVGnIqoy84xD7YLHUtqs/4qyYEWrevdCrp9N0/Vh6tVAK2lYQv xYG3mDmNp43WCVlhWLDt92RPAp2zyfM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uhv8bF7V; spf=pass (imf26.hostedemail.com: domain of 3YRiyZQoKCI4G6A9Gsz4wvy66y3w.u64305CF-442Dsu2.69y@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YRiyZQoKCI4G6A9Gsz4wvy66y3w.u64305CF-442Dsu2.69y@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc223d528cfso9940499276.0 for ; Thu, 25 Jan 2024 00:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706170465; x=1706775265; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=TTmwN8C5xYYKtz8HRfXOUdRFW/9rByTcl8wDVg46w14=; b=uhv8bF7VBj5ppMXvN1K7E+QsGdOXV8mqXr0gWoIjq79yqeSMnC61AbldOX/wbPdjzf gjrzloF3vned3Fs3d2miG/GBeNDN8jwgZQLvCfhrZEiq8a/yOn3WKgWE/wA4iY3cMVwL kLwd2daMGrxfBeS0fNccE9sHCrgmoQb7+QjWNQjPm9f5S37ezPCvpZFMTMr2NoDzBO8K pt9b8TkD4chm+fdWJKEgWl6JVt4LUJm7lgLH57vpr2biuwyjcfdIYJL5Pn7rdWqCJFlO vl7BKqaoqK+4yBM+NVoQsrcstJ8FT6jmFrFNr/Lk7Kmn5t6EP5tCy285f5ULFypZFE56 839g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706170465; x=1706775265; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TTmwN8C5xYYKtz8HRfXOUdRFW/9rByTcl8wDVg46w14=; b=kA1BWQLF+p6MCeTUglT31nIxZY68WMRR3wSGJ8ygGDVVHP+QAgzONvIC182H3eWEHd ZXUMsZMAkh+FRMd214/bgjl9AyD9V5lBrUPU92gu1APeQI3CdsXHpQHMtJDw7F8595sl /RFho4ubseQef/fXnBTkHLUEleQTNI2hQH4FJVcahWyqgwF7k165KZ7/9Y7Oq4dP000+ 7Ic2L4cB2iC9BTgJmoYFrzQKhtHvBEkyX2fmWSqXO9rYQ4RYNJiXAFcEOnXfENuVsOQA ejDtyoM3By9SKSEAejraF78KXsZ8iM20sPnDVedMOWWeWeswwmXrsi7D9QgRlCLLlUcT zZXQ== X-Gm-Message-State: AOJu0YzX9OHPYTmBFlQvbWphPtQTMFKF9FhkKGTIky8ziZGlv6Zw/ZSo x+2p2WxdSL/uvGzstqJyOMGnLlOVJ3sm/XrwJscIQnGUBnMJTbKXNuyLJ4JD1F62Z+RnQLkButa v2Xh60Jp75Udt6FWbZA== X-Google-Smtp-Source: AGHT+IEmIZ/mL85IsFYjAaDuaM20Cii+U62blSXhK4wu6TlhAr0VTMyS7xVgS4ve41dEQ7SZA/MZwxeZ8ONws8RI X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:29b4]) (user=yosryahmed job=sendgmr) by 2002:a05:6902:2303:b0:dc2:1f3b:abdd with SMTP id do3-20020a056902230300b00dc21f3babddmr340427ybb.5.1706170465455; Thu, 25 Jan 2024 00:14:25 -0800 (PST) Date: Thu, 25 Jan 2024 08:14:23 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240125081423.1200336-1-yosryahmed@google.com> Subject: [PATCH] mm: zswap: remove unused tree argument in zswap_entry_put() From: Yosry Ahmed To: Andrew Morton Cc: Johannes Weiner , Nhat Pham , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yosry Ahmed X-Rspamd-Queue-Id: 5B528140002 X-Rspam-User: X-Stat-Signature: 6aor4atxasf74aj48qbhotjcccnitqwb X-Rspamd-Server: rspam03 X-HE-Tag: 1706170466-895099 X-HE-Meta: U2FsdGVkX1+D4wKwjOYQ9LVb66asGOIWZRU1N42Hucz4+h6lKk+6mohJhPC8nkkw9e5vHQvDnKtITZfhmJgVOCm9WmcyhtrQCG1yFUCsSuuUQp6ZdnUzx96V1l+vS6Mcx7qK+ymKxxn9POWa5EhUT1Yq6A6E4wg8cOALOB6iKwdo6RxlVFGkoATs3S6CIk77EvrQXasUcl2omdhjK6Q6nKlx+JjHiEzmCLvU1ROiZ362xdWexOSScVXZ7MpRpkr3V+PVST3byuNvs/nZwsdzUydIhdwl7alCOwAunYhHBGSoRAKt9/F0ex05lFnHvaJseL0SPTZRKgm8sjJiq4RKxECKHf/pHaWPzw48HLPI0DdzY6K4pmNHNExTyb6OwpgAJfMCUIJVrdY6yL7AoMcc1ocrgeyLUt+2v3RUEl+wFODZqeljiRy1Y9cMjpviDnsD6Qcug5zwSfLvNbHmYTPBOyIyQn9y4PyJUB/8WMGwohevg8lQLw5bhLedsWao09XbxN41gOwOYij/QDbv7oJ1lelevEXp2h/wvERzR16dnssNRHvnHlLD+O3dXkX+iaYqgcj1hPPg1rPz+hwwjjZ0ptfmjzbKPneHwisSS4lR5CaqrFiRMoD7d/6XZaCEf/WcPZsOEyS3U1HX36FKY8LkNJhcWR3NjdAnZ7efyWlheypJyjxrkPMxongZ1pIppoNmdrxOmW/kO2zeraJMZ+WcGnebkK4hB/LcJ24X6tRZj5WOk1It/MWZ7X79wP6x62Iz8SIvqiWLgvLcsShrP5f2esv7kxxHAp8YyMGPX8GJlyOBTlwOGQsNK20IdEU+bAWZmDbxViMtAU8MQuqICcSeUW3aXOVVQZ1NtV9yzNlZeAhW+7fmukzD74wc0cCA3rXXju1IN+JGZ1tCeIQYB26OfaUW2imLbA1OiTj6Dg7L0zVzHa/TTd7GJSrC0d3vUz7zUtXN1mQbfSoVZUNJOuF pbsPfNjl 8bfIGQiishjUCcXE4AyKzDedGYSZ6GXWChnbuf5U/SGxk5NkEX/g5drXRwmLO5msgJyHB4/4Fgo1CuAwBSdVJHOFnRxvMjwIcc2NbZn0YVXbemcVagYRKZIExUaLG22cUFEyQ5YV4gtYDcuF/2bFWm+fDu8OSgB2dmSFgfKOfM3MJex8HEl0wJQchv+9ysTTPsY/2bGJnPpd16ATh2ZxhUHpkxdWWQXO4E1U4n6oxcZXzx1niAiY8+13ZFFtOCViV3Ggkzp8kOLQiyofFRm194cEO4usGOjbvK7ByWbfn5yCBVu1OEUA95+NnPtF5DYr8DTewxAYeZ5AegoS4pTB8cPxc975M5HQPWR81RgCJiYvJldwJNxLPK/2NLuqBgCmAZx7oEdUHNCPxdRd78ICu4CSHJZP4sIpnNem+C0rcQ2/Tz0hkJbXkDi3JZIdcrBe4qdaTXsP+ThBTOU2m0U0/Er9jkSilff1tLYQx5BYDG5jq/frrlibe78MfVNcn2+Kys9nryh0LDckSitCl/M4zJWfxEc/kFIWt+XOqhNlpvcp27Q5yu5nJvBY6amWIhIf8WAQWIuAuB6Ehxn02lNR3rDunR8p9v68Dc5Ojie06S4r2kwK5NTZQvqQAlP0gQaWG7PobBLVYtGLn9eB8lUIJ0oBJEsO1jP/1Q6bBSS5qnAsl4m3whRSyY6NAkw== 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: Commit 7310895779624 ("mm: zswap: tighten up entry invalidation") removed the usage of tree argument, delete it. Signed-off-by: Yosry Ahmed Reviewed-by: Chengming Zhou Acked-by: Johannes Weiner Reviewed-by: Nhat Pham --- mm/zswap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 78df16d307aa8..8f4a7efc2bdae 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -569,8 +569,7 @@ static void zswap_entry_get(struct zswap_entry *entry) /* caller must hold the tree lock * remove from the tree and free it, if nobody reference the entry */ -static void zswap_entry_put(struct zswap_tree *tree, - struct zswap_entry *entry) +static void zswap_entry_put(struct zswap_entry *entry) { int refcount = --entry->refcount; @@ -853,7 +852,7 @@ static void zswap_invalidate_entry(struct zswap_tree *tree, struct zswap_entry *entry) { if (zswap_rb_erase(&tree->rbroot, entry)) - zswap_entry_put(tree, entry); + zswap_entry_put(entry); } static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, @@ -924,7 +923,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o put_unlock: /* Drop local reference */ - zswap_entry_put(tree, entry); + zswap_entry_put(entry); unlock: spin_unlock(&tree->lock); spin_lock(lock); @@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio) zswap_lru_del(&entry->pool->list_lru, entry); zswap_lru_add(&entry->pool->list_lru, entry); } - zswap_entry_put(tree, entry); + zswap_entry_put(entry); spin_unlock(&tree->lock); return true;