From patchwork Tue Jan 30 01:36:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 13536667 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 223FAC47DA9 for ; Tue, 30 Jan 2024 01:42:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 870976B00A9; Mon, 29 Jan 2024 20:42:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 821566B00AA; Mon, 29 Jan 2024 20:42:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 674206B00AB; Mon, 29 Jan 2024 20:42:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 546616B00A9 for ; Mon, 29 Jan 2024 20:42:18 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2924B140AD6 for ; Tue, 30 Jan 2024 01:42:18 +0000 (UTC) X-FDA: 81734277156.07.C16433A Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by imf14.hostedemail.com (Postfix) with ESMTP id 32A37100006 for ; Tue, 30 Jan 2024 01:42:16 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=qwx1yi1U; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.222.179 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706578936; 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=shLTg8CbwWEN2YIGT7dz17BRQIDu5G+tg/uQhre6QiQ=; b=Z+zDiFLbzWSjvaiJDg8A3pq+EK6jC98r8W+Fs6vt2iU9CUJQ3Axfj/Ekv2lPBXoXhfn/Hq p9P3rYBk3kGWq+VFezcPoy9iIp824DqywIDy1Hb4QY2jj0RyIjYh1jeJW1qh/8pKlDBQZn Vuo99fQXYgS7bJKxLh0uE7lg8rfn/CA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=qwx1yi1U; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.222.179 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706578936; a=rsa-sha256; cv=none; b=MQRYlD8c1rsVIWEIUVCuvDpjSAQHuyr+m/wS6oIqwQcz6zQrkyfnKmlXyiHzHFgDPxcPaE u6dViu04+xUoiOI+zF/P9bNiwhYvyVuEC1UykNKZmOA6S0acF1k0LR/7DOZs9I6fStNE8B G5aSokHvgK7mMirrKkMgSVRXUPOoO0k= Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-783f49812aeso147112185a.2 for ; Mon, 29 Jan 2024 17:42:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1706578935; x=1707183735; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=shLTg8CbwWEN2YIGT7dz17BRQIDu5G+tg/uQhre6QiQ=; b=qwx1yi1UBTz77b3b7rgmi/8HfVOjJDGh4y6qFmGOydL8fW/gGwtMh4JK1b9Ku+oXA5 mrbtbUhllPxGMHPBzq3tRP1WEBO5vOtxLd6nlf87zTxA1n4LODlxKYmT/xumLUfeJA43 O9hjdsbWw6003R/+TNtUNOx0MCl02cf/I0VcxiLwiaXPTSvp9R4lIvUaSNrCO/jxBl+e FUDBt/o7m5CHJChpg5/LHxfJ+368aDYsQtC6/Z56OAmP7FcFtxdqYPRGVslfku0ZyM+o kBrfFBUTcJSaYFcUUGgvKXY5Tb7XpeYMcM15NNm7iDgHVpLlKCdnx/jkDD6tuapVR5AH h6eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706578935; x=1707183735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=shLTg8CbwWEN2YIGT7dz17BRQIDu5G+tg/uQhre6QiQ=; b=VvYgjIKKxhy/hgtUQvuenax1h7M1QbPN51yugOEdGjgeED5g3QTIm25NtqqRss7N3T MuAx292GXCq9EV1O702qr5aCwuDwXaU/wpLAgKJKNGK4mEgpxbf5k4K398Y17/0gUq64 mK71PDvcRLicWTP3jTx69liGfsnCQuNlXKBivgaS79b5KZMLpRJ1eY9GD6gNhQcVturR ZXsTwFZ3/jfYiNYlhrK7unjE1/s/pE5CL4uqLS6pap7pHAvqP3GpnwNgnJMHMSshIi/P 38RN038ApRuw8UtsqDLm/uFmR1rAqwn8L9TDL32/AOAXD9gM1Iw00xmNoV9p0OgrccZ5 DekQ== X-Gm-Message-State: AOJu0YxqZfg4EM674PWc0KIdBfxggvZyzWlfnZSiCGFEdwPXU1SNo/E9 U2fiDClpl4avVjSQodLmg8+6UvSvw97KUwlTbZCe4NIWDtvmqPEi1rBBZ0m64Rk= X-Google-Smtp-Source: AGHT+IE9qj83y7G4z9fihmAKWWcQVG1MGvLQrnNFWv+a/2imYaxhEYRxeU9+t7c0pWlonGDYF9KF1A== X-Received: by 2002:a05:620a:15ae:b0:783:8a70:f64 with SMTP id f14-20020a05620a15ae00b007838a700f64mr6881421qkk.65.1706578935257; Mon, 29 Jan 2024 17:42:15 -0800 (PST) Received: from localhost (2603-7000-0c01-2716-da5e-d3ff-fee7-26e7.res6.spectrum.com. [2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id o26-20020a05620a111a00b00784046b7868sm794053qkk.90.2024.01.29.17.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 17:42:15 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Nhat Pham , Yosry Ahmed , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/20] mm: zswap: rename zswap_free_entry to zswap_entry_free Date: Mon, 29 Jan 2024 20:36:37 -0500 Message-ID: <20240130014208.565554-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240130014208.565554-1-hannes@cmpxchg.org> References: <20240130014208.565554-1-hannes@cmpxchg.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 32A37100006 X-Stat-Signature: gt575emkgttemep343jbm9gcwbsrdwdz X-HE-Tag: 1706578936-170591 X-HE-Meta: U2FsdGVkX19zwlJ4qXDN92Y6/VBC4Jfi9t/Zu9tQIJ8ZJ7aPQjP2qfDY2YV7KYFoz06rBkq7oDchUN2Ewr0OasRpdUJ70n1s38zyKgdwTMAC1Z3Y3XfD4iBfi+TdLU6i0tT1/isUIn2vQnsBI8bWKMzZnLAEGww6xnR1fBBb1gevoihux6Ye1DTXYt1JpY1rRf5z7AcxwxDPLL/3+UCv2ATAY+mx1Wc305I+fLReHwjuLRC0bgNzYfv61hDMszSQJdDy/VXumnEyeJzS3rLpZNtqiHmw/+FIS9V+UOL58JL4DgmaCsOCADRs8QZLtnBmEM4KfMmk96s9iGVqzZZg8p1hEy9FibUrvWSnF4gSqRooZx8K+iTDHa+NsVGSb9C6cujLWkjye7asfUzJC542QAaQ5YFnKDFuuTnVMd7InT/rMAUjHssTXxbEfocav/Wro/1wJQdXIwTuVQF+EVcUaLn8XklB7jNwvFIszrkcfjLKj+SgYafxPBfEaq/JUxoQHVRt88fJe2OQ4qGozCwq6e0mgeX+eddwYcDZ/WxNH++yU/ZTl4h53l3Rz3bxEStDY+21gueYkFCbnFY6fOLRygMfPoZZPnQFJzXeYR6b55F6ujsFhGm9ItxanvA07XtST2EdJXPn9FCCuxiBcLSU7E8pg9ufxd251KlcckV4o9HGHJXbXpLZvWdmAPMrWVOFauc9bzmlk7ulOIga0tNHxCWN+tDuctwdWzfa2fhnoH2Z6GwmK++DMv33EfwYZ9xdITOcy4BfJ07B4qdqz0KlB6r0HCkhuJ8T4Eaf+a8xCH6hnTrY5n0QoEcS3lyXm0v+6Djyi2c/syGh5iH3G9tzZl+51x1eQVRjOWgRkri1cyQ8aSqKpwTDYjljWhzBUSnnvm3TP/Vpj7/BJTkb5N/4TCiWkQrb2ctsgTQsqMDbvx2p+2azWaQxKxw2oy9gtuG8Rc+POUCLPiH4TjVMxeN QjC3Dz/A fQzBYev11bMOOX7q1GU2+DunGXQHdeRCT+uS1dtAhk2Ehyp7HfAz2sNy4g9d+muc+p2XY3g+9A+AHr0b05LjNNh+zEF1WN01jpTaJoPXXZjD25oitae86THOHBcQjN+XqRm4j267XSv18+Ssfi25yNIjyPbQy67zbi7/lOpXQx+DY8hGi/sLZ5ssy4MM7yOO2+d8zTuh6fNFCt/gVIfyEK2fpwPV19qGSg9ZlKZn6qaBHXSC2/n4wT+J8mo5TeDKZxkayrD4kaoOD2jmbcq3hrGV1IYOxM/dnS/m54zbECJB9ql4rbM74bypOiWf7UrpmtbWyjCVzNrd9D7Id+xn5QkqV42MBknMhrifp8eX5YJC+SHYxIo8hU2Lq/+LT6kYuKOuZS1rVazGyuSiU7V3EKTIMrqYA5EwjmdPneVFhmimekpxPmRbEczngmQ9xf9j9jg8Jg5zPvzEKoAtCWgIPYEwMi5O4ha8M2CJA8YRFFKjoOpQ= 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: There is a zswap_entry_ namespace with multiple functions already. Signed-off-by: Johannes Weiner Reviewed-by: Chengming Zhou Acked-by: Yosry Ahmed Acked-by: Nhat Pham --- mm/zswap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 7f88b3a77e4a..173f2e6657de 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -520,7 +520,7 @@ static struct zpool *zswap_find_zpool(struct zswap_entry *entry) * Carries out the common pattern of freeing and entry's zpool allocation, * freeing the entry itself, and decrementing the number of stored pages. */ -static void zswap_free_entry(struct zswap_entry *entry) +static void zswap_entry_free(struct zswap_entry *entry) { if (!entry->length) atomic_dec(&zswap_same_filled_pages); @@ -555,7 +555,7 @@ static void zswap_entry_put(struct zswap_entry *entry) WARN_ON_ONCE(refcount < 0); if (refcount == 0) { WARN_ON_ONCE(!RB_EMPTY_NODE(&entry->rbnode)); - zswap_free_entry(entry); + zswap_entry_free(entry); } }