From patchwork Mon Mar 11 23:52:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13589426 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 12D6EC5475B for ; Mon, 11 Mar 2024 23:52:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2AFC8D000A; Mon, 11 Mar 2024 19:52:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B42E8D0008; Mon, 11 Mar 2024 19:52:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 855128D000A; Mon, 11 Mar 2024 19:52:15 -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 722358D0008 for ; Mon, 11 Mar 2024 19:52:15 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3E8C7C035E for ; Mon, 11 Mar 2024 23:52:15 +0000 (UTC) X-FDA: 81886409430.09.7CC8B60 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf20.hostedemail.com (Postfix) with ESMTP id 7908F1C000D for ; Mon, 11 Mar 2024 23:52:13 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=3jMBLkk3; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3LJnvZQoKCFMJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3LJnvZQoKCFMJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710201133; 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=HoDCqku35T7YbxqPd3TAz1OoTvE4SVOE0AIV0UpVVT0=; b=5sIyjzQE/zfwyLcz5j3w3vc4bZr/1FRefB6IfG8ddGK6bpc8YNDcxHpeqva4tYOlSTCJJW hW3KWFyDp72Xr5XP2tSRYpYtNw9oCU6Cx5mvZMUk0eqx2byVbtdvQPKDCUgfuK0ELWIhDY ewHpClfGdRUacZyu+us1O4mcybs/y1U= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=3jMBLkk3; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3LJnvZQoKCFMJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3LJnvZQoKCFMJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710201133; a=rsa-sha256; cv=none; b=OhATJV+loA3d144FCXKrg19q2VDGVzrq3GJiRNAE6jCRtjDOv7rVccgLwBJ7N14IiTygy2 mlBnP6tDv09y45J8okr4RrbV+dRiZXloHab6ite/gRKU7ndeEk4CbsNn5uKGPpKjck1tkt 1LjCMeKMX8akt+GA/DU4d/gH2hG0wgY= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b26ce0bbso10515298276.1 for ; Mon, 11 Mar 2024 16:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710201132; x=1710805932; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=HoDCqku35T7YbxqPd3TAz1OoTvE4SVOE0AIV0UpVVT0=; b=3jMBLkk36+h0IiO2sYRaZ0hDfVaoE434qYxC/JLgLXSzayJFUs7hDHDhB2YXjFyZ7Y N/cbtdD5g4tu2/sMG03P/zKi/Tfwb66oGnROnHL9UUnxxi9s6csZ4pOQUEI+Z+tFAtnc EkeDk3AdyeZX/MTvWfWWK5KxNMxk0wuNM0w6WfW2b2NPfKAl6pP/W8yGsBQpTb1n5ceJ FrlrkZPPCh2acF630Mc0PfXUFX9ay4N5PhZPuytchAPFcu90g2zS/amzW3xbnKgefDLE jbWtWmis4I5JQR91hQYMoRZ7ZqyuE+5zLX0zb8pG3L6mNfjE9ouNm7iZXOewv2L72CMA UQfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710201132; x=1710805932; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HoDCqku35T7YbxqPd3TAz1OoTvE4SVOE0AIV0UpVVT0=; b=Kd9V9pQ38qFUntUdYVrgBHao64ubxJu2IBU1PC2ic5Sh7kK/82dtkCjKZBOiwRlA62 RCpZnXX3KEIehIrn4iuLm7NddVN26zfbXZLcoxxh7RU87XKvDEdUiGSScZCe/LDhHBzY ZF2c12MpkVO88Z0AgcG3qqaGxSjfdvPtHIn7hHVLFA3f4hHo5JZhz5ubm2DZPuEekf40 TVjBcKRoTq1TEZ4eSMIgKQA5P6Eow4GxHPuSyiCMIHJ71/2FOeeNbCNSeMl4XWZaBgSw SMuA17VF5yCQ76PECQ/htt5FM5vUq+ngpGHXd+JU2kUHnIJbldYLVtDIMz2W8Cl1/yTs uglw== X-Forwarded-Encrypted: i=1; AJvYcCUwMObFlS581QmkmaN/animXoYYpDVgtlDEof23kV+k32qjyScl8i+a+z/xJLLko7XoJFT+j6HcjGb8yBfAQKD8DoM= X-Gm-Message-State: AOJu0YymePZoM5Eo6LL9sxI86Dp13opfC5n6ulwIUrzdLWf8fLQuNKU5 JxwJBs3JormZmFyMMkJ2KDZtc0OuYI2QqzE9BZrkKTERv5B7KpkW+CDxxWHhCtOpccFRM3zAKUH x5Kw0FKvtmslMrLoxIg== X-Google-Smtp-Source: AGHT+IGvoB6x0HUGO9cKrUhakaBjnzL5PQuqIrdPSs5csd6UtFI4bJM31GyU0eku4GbNJXOK7s5b21fIZKPIOmYT X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:29b4]) (user=yosryahmed job=sendgmr) by 2002:a25:dbc2:0:b0:dc6:d233:ffdd with SMTP id g185-20020a25dbc2000000b00dc6d233ffddmr2219113ybf.0.1710201132663; Mon, 11 Mar 2024 16:52:12 -0700 (PDT) Date: Mon, 11 Mar 2024 23:52:10 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240311235210.2937484-1-yosryahmed@google.com> Subject: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool() 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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7908F1C000D X-Stat-Signature: puyg86pq3hkmnecuzpm7idmgyctips8i X-HE-Tag: 1710201133-899479 X-HE-Meta: U2FsdGVkX1+Ta5ndfYXGL8i6TincafOCT7tCZvHiA7iv87Kz/fsEc9wLNlRzCcMbCytPGO05odt1s4V/PNWcS3aU1DJi37NiRCip18ZWfefe70d1ODKqChW92H2q5sikD+wkfiFJ28wOb3WqLFRcnm+AxcFnmeALqWu4THZi+tTuLzThimRzWrWzXpY106QGrAu7YlO0oCKsr8N3YzHewI3gjMhLThqeLSM0ylFGcWY6roN5QOCRi1rV2l0BbZoP8MUpXuINuCDddvthzX2bWZ23xzOBo+3lIoOtGBn+q5kML4KXNPiBquqZ/4r6Q7Refm94KxKvtwjgboHo3XiUMUfxXsvLYNsnK9MsKJCpv0hLlVEbnfIcrLkhZnL5oAoxQ5Krk61i1ymH30OatM2I/uOypCPV71HPkEY0zxkCURI4ZRGb8i8K492Jv1JnAhsovynyuLzXH897X1gFrAy7m3RsWmzbRPtbLSjxAx7WniM502W70vm7AKdhpKKXpaxT+aQ4hbqwjqcMa6WY6U/EMbWRZtGXps2hC7KID1KNNc2UYd1egQUtILtlp0xKdd5KmlzPaADKU1q4IOlemLewZvet44S8h98hUjjSvAbna1nIRB3Z0W09LyUrJ8wm3azHXF30Dq5VDS909j+Ec7rnD1m9zJjLbqqE/HW/An4j7MnIYZAXJtkjxFubK0fnCL3WK5NIS8jje0LIAFE6elDsiXPGqtx5N9SUq/xPumXhD9kQQfqXHq2qa4MMAv/5gFD1G5BLI+QulGKf25ZqOLh9HFSfgcTDPM0HglHmpBwGm2ok0JBjw0q5LRXW76FrBIUuZKst1CrrjHWYS8lOiu+WKsjE0B3ltk7RYGz09u+GGI05qRMZp8bTtO/XcKy7dNa9pb69X6Rn1sJlwCoyiXobACZnJ2HYPFVsMmi1NW/JtKhAKb/qhCUnWhD3GbhMtBSoqauFXqv1pIo4WiIGjy7 ZANeRXTx jQMHeQBKal1CQEkNj0S+hIq+mM9Lm39z+mtVpaWKWWEX+KcbxSSvXIelLhY3zMOjPSJCMVrB3ZSOMU2DdwY4jCXscjLJNUhPVKIjg6qvXqptf/XfTWRsRXQNlNfHptue/NZO/PN2nGJhbxfz9G/+Ub9B64jgZO+6qPcMcnMHGGYc52iSqHqN2cIdFp8nAdxTpwbqjUc5YoOmD8ApdHZigUTY6tJ7AwJ3a8KaqCrbjCsSGdGkxPAPIDV5n8wg7OB0rz9riMpqLDnce45MRaVMAGtd9aXESMdR/raEaWiYw63Vm5miFS41q8Ty4a1vSBcXdeel5N1KzBPpp7SqHw9Aj2738JMYyRI2uArNsB+tqcxYwpMJ4FSsnruxr/p7fvakMlnYM+tePkU7cYbCnOvx7QVGjFhIKsl6nei+arStO0iWC5GRhP52XUi57g+mxvXkcMCodyZCyC01zfxp7d+H3HOo6tTP6aHk/sLkckQcZd/zJfkak9dccRfdd1lTV9Zw0nct3p2PpZtyNr78lQw+4FZ3g75VJ+eiVKNKJDz/rPj/0aAqwyoMh1pkauSa7mG5eolweJVQW9515c/TGAWhPc26GTqG3D+CeFo1dLfhEjKI9N8r5UABr+fUrcPFGOO83ZT9Alu0ysSycdtD/sxo5DDwC7pKyss5vTG3tQ0xfK3dJpuU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000040, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true. This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a config option and never made it upstream. Remove the unnecessary check. Signed-off-by: Yosry Ahmed Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham Acked-by: Johannes Weiner --- mm/zswap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 9a32377520827..c6267b5e0999a 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -884,12 +884,7 @@ static void zswap_entry_cache_free(struct zswap_entry *entry) static struct zpool *zswap_find_zpool(struct zswap_entry *entry) { - int i = 0; - - if (ZSWAP_NR_ZPOOLS > 1) - i = hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS)); - - return entry->pool->zpools[i]; + return entry->pool->zpools[hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS))]; } /*