From nobody Wed Dec 24 16:05:30 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71D4917588 for ; Thu, 25 Jan 2024 08:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706170467; cv=none; b=OW+51UK6tKpm5ppEVjvR0R9i/tNewwR64yjIOTErRr8WkuTzcjEkHkkhk0PlSDPjfARYMkZDQH925rwDX797In40xJ3BqciOcxHWf3ozBod8X2bOYYdrS6wNkubGirkPnpJwYj6cNwlFpI1geJJHTgVcAeSYUyaNfqoqcg1Eqdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706170467; c=relaxed/simple; bh=JaR4jvVKPHNgoMUjvN9Fx0qi2/jFA8uL0LDZS34O6wg=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=EnOtt8qmBrxfX0mVeRpeXp8hGZfuMHtQDm302LBXLJmPX+wUodIYC1CSZrZSdk2Xm0aGyAw0XbcFd4REm0bqREe9dEvCEzfApqRLPRxFzIuFRe3PYKkoj2TkiZS7g2/Jy6ox31VUKkKehKMoDKoJjRqLLeDc45pBSv5U/VnuZ3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yosryahmed.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jM5+VJCW; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yosryahmed.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jM5+VJCW" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dbdb46770d7so9482256276.1 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=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=TTmwN8C5xYYKtz8HRfXOUdRFW/9rByTcl8wDVg46w14=; b=jM5+VJCW1Rq81Cu5tQR1mCKGkl76sVvWnla8eBTnCQ8D5U69C8Ps009ItF/Uqajr2T BKfmbtNVg+MiQ6FqEWi2itmk+cz2/sVSxLQ9TGOUaRgByXASzdKApjchG+QeHVddC8IP pzhC/sQeqf4xApxHBAW6Yk2zPXxtwhuJOtRCBKJhmaESuhY0dc6LJIfc5emSwCOQIcva BNJtybGKbQ2PyA6ogssHy4wmjE2fJoiEjyfm3V74hUPPWgmIOQ+s4S++xTQ1Yt67qKK5 mKWaLhJ8BM5GNUExJZ08TeNciT5ml98AFRBX/O3vMhHnpP6q5mO1NuoxAwmzDrRGnaGc x6xA== 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=h+kR+ClpI6BjDHi+woIQPqk+HCjA60TcXFyLGhFZjdQgD04MRSBFLcHIcHPfetCOr5 1jJ/JKux7FF/NevbeuXEJI37PGfvt3PSW7vM5UgZRb2bMvPirqply3SHBR56EZo0IdDR 30cnGAPgjP6oBWOxY7RuwWEyBDKxjMTSBac6VggL52NVbLMQU1621DVfqefGhttbMZPt C0qooexs80UOwkIWQkHPQl3i9wVhTJQmJ4+EbjnW80sT2OY7zbfZkqWF45yyFtpg6e5K IJgXz7QanzwMsJ/Z3rBJ44z+y/7MLbZ6D7QeWqOnS8pC1PI3Jp6EyWAElMOTMH22MZq5 oxiw== X-Gm-Message-State: AOJu0YzZbzlw1uJfTCmpKn/cWSyjYdpsJU1a2pAzV5I1fOPgk0blOsdp 60nprKbOvbF2Bx0Aa9ftDicoXZWXOoEBFOZril8jhmQ08/oHyKfIMpV2u+0LG923rp404fiZ6mF gxTT+r0zHJpOYGn+1Jw== 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 7310895779624 ("mm: zswap: tighten up entry invalidation") removed the usage of tree argument, delete it. Signed-off-by: Yosry Ahmed Acked-by: Johannes Weiner Reviewed-by: Chengming Zhou 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 =3D --entry->refcount; =20 @@ -853,7 +852,7 @@ static void zswap_invalidate_entry(struct zswap_tree *t= ree, struct zswap_entry *entry) { if (zswap_rb_erase(&tree->rbroot, entry)) - zswap_entry_put(tree, entry); + zswap_entry_put(entry); } =20 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 =20 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); =20 return true; --=20 2.43.0.429.g432eaa2c6b-goog