From patchwork Mon Mar 3 17:25:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13999311 X-Patchwork-Delegate: cel@kernel.org 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 5FC5223ED75; Mon, 3 Mar 2025 17:26:16 +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=1741022777; cv=none; b=NwW6JB7TLEGy1QPEGC+lDy8gzxrqRujlp6qIgm29w2gsQtRibKsPmMawvLrvPJHjoVfm/ORPd0m465O6NgcNb4Au3irTw++jeHfHjeFIsf6Pj7CDlZeo2tG9+D9VOEt+UN7stODxP9ozQupay0cGA3fmUdqu07L87S3xtXXSAuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741022777; c=relaxed/simple; bh=TLjwn8OvC2xRxNHgLGlT6YzixDeTdY+umrapqFPiZi0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qRo/a+r4KGmfa5nNe3MP8+BCsOIWEvnucPU+fmzQ2Lvnn5BhzBB/uNrsN6MZxE/g6Rw4qgdBVTVtaDDFX3FOhVSugHix8DlDcTRuv5wgyEdMhp4YHzZw+WMImp84ICaFWjPGHAH6I8jivcgBTLRZzyzkzcFSQBvqXXDPjiiLxV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OKxibQsr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OKxibQsr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B427C4CEEA; Mon, 3 Mar 2025 17:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741022776; bh=TLjwn8OvC2xRxNHgLGlT6YzixDeTdY+umrapqFPiZi0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OKxibQsrqsSTlM968LNwlspsWF8Uy/fTD+rLkV7irdXi6/9OQ8qqhyZFKu3/P9xj5 y72faIAopJY9IC59BdkC9iWfKlT8/ZegSEZJqAWQqF1sQMrcWt2bMbeff4vjXjUkkU kQWHrppB8ZCI0ErgE+VtucS2NEBNm3z3INO/RZfyX3KycdROBFie3ZV68bTEF4hpgq fPWcmKWODgIZlLTmWUk4QgvoKmKewb6MKmTBsQ5LvqYLbq2Ss24rS3xBeAXrM+1imt QK8EkU8Orqp2qoYSlJBVnVsU0ufpAXeFnhPtBRHQ62qJTw5ICV3Bk+/ViLjMfqiGKh 9//8kiqIlkplg== From: Jeff Layton Date: Mon, 03 Mar 2025 12:25:59 -0500 Subject: [PATCH 1/5] nfsd: reorganize struct nfs4_delegation for better packing Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-nfsd-cleanup-v1-1-14068e8f59c5@kernel.org> References: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> In-Reply-To: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=731; i=jlayton@kernel.org; h=from:subject:message-id; bh=TLjwn8OvC2xRxNHgLGlT6YzixDeTdY+umrapqFPiZi0=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnxeY1vpggjGoEj3YtDf3e7GWM44RrbydQi9fQO Yfp6tgzRPKJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ8XmNQAKCRAADmhBGVaC FRKJD/9CpXM4lbJxvqIwY2WxIDJQFCHSJopqNTHXtjxmm6NZwkGcXNHRM/czh7P5n1fuvXHUZJY uSFyzgpil3n1XHwFhisEfrzJJEGpPFQo7QrhykUM99K+M72bHjxXRw7idlxLD/m3cAHQa5fkXKN f43ucScxXTc2z5dDo+cKieHJIEiLGPQjoWIzysv3SE6xjlqG1tItF0mrScYW4jdx/3mEctl7JmM +H6a4JljVgNkDPoXQbg9pnNWCMaL2moQCGIxDRw6lf55ODJc1ToYV5d9TnoqusT0peul5DEShZd yND58EAqTXxeHsZIKXvKmiasViraVv9PEQIJwARzNNkJv2V4H3WXV9mU2DS1JSwo7QkdmbtG8yq kHUgVqOyin9S28NK8/43tSBA6W1p002EfxRsEhZMaO3YdI0AdU1TAkaq+/GK8xGF2KM2PolegP3 WEMFJrXk0k7gGi4ph1lJoZ0vr0si/rYGIK7Gs4FjHsDM2+3Rmm7MtDdPtgpA1+7ZQ1gjvA5qYw/ ApTkIETwtJVbnxTmsHwkb4G+buQpoMmYky9AL6D24dtfUs4YUpkVvjnE1+ns1kM6DqlLoWrJAUK jQbi9caFjaBYxgHS31PTfyMcnXledj0ComQeXeha/Vy9IyUHCcndGXEb3S1PBbsyNM3XSVvOupa QnlYCyTE4OyxW1g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Move dl_type field above dl_time, which shaves 8 bytes off this struct. Signed-off-by: Jeff Layton --- fs/nfsd/state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 0537f5c001a4d581433ca5aca235188fe68b14e5..625a77107d29121d630d456183e01c9f903f758a 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -215,8 +215,8 @@ struct nfs4_delegation { struct list_head dl_perclnt; struct list_head dl_recall_lru; /* delegation recalled */ struct nfs4_clnt_odstate *dl_clnt_odstate; - u32 dl_type; time64_t dl_time; + u32 dl_type; /* For recall: */ int dl_retries; struct nfsd4_callback dl_recall; From patchwork Mon Mar 3 17:26:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13999313 X-Patchwork-Delegate: cel@kernel.org 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 5FBF323ED72; Mon, 3 Mar 2025 17:26:17 +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=1741022777; cv=none; b=Ohe7zpR0Io5Mz48/g9tFO4WuX54zzeKnJtptnuipk/8RnxpaVTsfiMasDvu4MeqRDV2kQpzA8oXGXxTM2lPBMaK2xMRD/uoC2vttVbma3W+cpaKloe4jSc3HvDwsx9D2UNk3zIZINSEv7OIklHWezR9TXhAYX0QncMegeNwclc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741022777; c=relaxed/simple; bh=5ps/lRcV8mI+EOJr2ILZlLxZ6dG3Q0LGDfar6CNuxvg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JYiKtUZ3d4rfOD5uwEk8mgMwUrEX08P6sjk8oqBUn5yaNCYqXfVFjfUDKOlKJIYvbeWNL0XMoDQrlKclMCf3ShI24EYRhqr5kojHzXWh41Po2CTmxydDIuF+3hIqK58l14xVTcJdOc5td1xUJRi8f10tHG4lWNiBd3K96Rjgs/Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K7vjiK5Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K7vjiK5Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36929C4CEE9; Mon, 3 Mar 2025 17:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741022776; bh=5ps/lRcV8mI+EOJr2ILZlLxZ6dG3Q0LGDfar6CNuxvg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=K7vjiK5Q0F9Wc/vEbhtmSYUuPqgsP+zJ6yqKyb7Dfnq33OXVDJArCjdlc30at7EJz VEyAn8ecFiMzfnJV2xNT8+mJuyd9yLJSSQs8pvopycZNRuhkUz4KiqNv6bOKDE+Eqm FUBk64dbSheEfcdg2ZS4lpOPZdKFTGxjOPeivH3prgOjj1Emf7k7ouHorxyfoZWuuI 0LBelWdbpechROnNrqXtNeltNbesgAAXz8FxO4hLouhXWLL4lnc4l1kluzcVRHK6ao 7I95edxRrohzd9OHuGyAYOx7AgyLZ/x4lYOjFYycNFPdL/l0gWKj6NAR41lxsfmekn j4xFL3q98vLEQ== From: Jeff Layton Date: Mon, 03 Mar 2025 12:26:00 -0500 Subject: [PATCH 2/5] nfsd: remove unneeded forward declaration of nfsd4_mark_cb_fault() Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-nfsd-cleanup-v1-2-14068e8f59c5@kernel.org> References: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> In-Reply-To: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=585; i=jlayton@kernel.org; h=from:subject:message-id; bh=5ps/lRcV8mI+EOJr2ILZlLxZ6dG3Q0LGDfar6CNuxvg=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnxeY1aBmU10/MDzC9Tjl3rVg5+8MYHehwRU4bh I5CY8ZDR36JAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ8XmNQAKCRAADmhBGVaC FV41D/oDFim3x2p+rsL0MRYrb1vapxGhhs60e9v9AfZgYuWKAhKm/yED9tCFppA6e/Y5wWlxhTt hO8Q9lkEFhCPM+cjf2nWoXiE79Uut5LavqrPEldnDt/gEXxWWtETtV8If19McCR5LSf90I1Facy YZYSt2BAao6X9jX0t62BEOMQTCye6L9uw+vKyJR20di/blwmQhJU96YewtXOwZ7RmCjfnV19C2E rXuyGStvtetxKow6SWFQzwwhGWWEYyvl8sU4Gl7KG8Lu4Kc2wPtP9e6b5Jj+LZ7jUFQaDOtQUTd ne1X6lpZu3EREIZPKMa0bum4NcfZp5BEQe6UDLHeFX4+cixQkj/wqSKWQjR3DwZjmwCZBwg2Llq 6eyRCyLA3WzbQCoDSA39kukd/fdNB9Q/WT3xZCduzNdsLY41QNLC+mmvWaxOT+4txcW4QUpJpvJ kMuqdfZR/xKt+70Om7qEHPf0P/HKgL17aym814vKfURFrJ3Raaer0vb5kYPlBiSGcslhV5/Ujlv 3b2XM+To/AQteIXy7xprPjr81Yyzsqp0Vu/FIwYU9LC0yryAX/kH5YUj+T25aDxgZDkSt6OLQDa ghUs9tyeWti/pcuYta5oOX57pQrh+6iwcxxzlrP6d198eTA4WxMqZKYRo8eKcCFWZCqcsfaKOyN zK299LcvdAYO9Iw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 This isn't needed. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index ab81774bf1d2766272e610f5d081f7c04d9b5933..ccb00aa93be01961fb182eb05470a7bd8e642256 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -46,8 +46,6 @@ #define NFSDDBG_FACILITY NFSDDBG_PROC -static void nfsd4_mark_cb_fault(struct nfs4_client *clp); - #define NFSPROC4_CB_NULL 0 #define NFSPROC4_CB_COMPOUND 1 From patchwork Mon Mar 3 17:26:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13999314 X-Patchwork-Delegate: cel@kernel.org 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 5E0B023FC41; Mon, 3 Mar 2025 17:26:17 +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=1741022778; cv=none; b=fWaAFUK/DS+LfxNAgz1IcCpud8pDKue7xU0m8FJG4Ox314+e6BukuvGTZYsbksNt86bWUamerEaqhRColU80X3P1+p+7NRhtL7dpsBLO8Uq5YOGlkGvDos5pJoh7ZWeuIdbQ7EpWUyu0CkAMqiklVXTylDZOHgPSYh6RtMIVlcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741022778; c=relaxed/simple; bh=ligIRskMGI2mV0cB3fQGOC9rdkD5pCR+/sRa7O/I+mw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WZimIUtUPKqjCve0LYLEVz9ZF3V56oSEl6fiiVxIb8RVZR+LuIXVIGqEmxFrGzKDsKWkyyjmrZYDWi26f+y+IwAYwvOiFoMpwVyef4lEHMs10fnLcXHMVD0YdzraUXzCTEKTuLgCU2yBUWGHatm61DMtckva8CVlFANDMt26v9Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y64vweQ9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y64vweQ9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23F4AC4CEED; Mon, 3 Mar 2025 17:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741022777; bh=ligIRskMGI2mV0cB3fQGOC9rdkD5pCR+/sRa7O/I+mw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Y64vweQ9292qpLCUMqoQHwGmp/9RDoz5DVIg8T2qg7wrSzWhV/RILm4N2xCSC0peJ gxmxBw8PRSKW07/tK7pn15vmqr0bhoQdqZJbvd0OqhyPbgQCa3c4ArcC+uGIIkJzWU DD1Lk/k2RFcSmWUJDPE6YaT97bpLsx6pYMCse7UTt8yrN+axeOHNnomc1nCKOj1zJD g2ijZn0jWXQh0uoBoNEL9YGfeC4ImPRIlpp1HbNZiW8ML0GoS9fMzSc5PtYdMojPUY dShlUmDf1eW2TcDZfGlTTzxZabnCUQk5KGHuHruiZ5nRA0D3C5gfG+a58rxNSyf+zh DC6jLY9Ewm2XA== From: Jeff Layton Date: Mon, 03 Mar 2025 12:26:01 -0500 Subject: [PATCH 3/5] nfsd: remove obsolete comment from nfs4_alloc_stid Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-nfsd-cleanup-v1-3-14068e8f59c5@kernel.org> References: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> In-Reply-To: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1104; i=jlayton@kernel.org; h=from:subject:message-id; bh=ligIRskMGI2mV0cB3fQGOC9rdkD5pCR+/sRa7O/I+mw=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnxeY1HutDQSlAnbxV16/ZyBkhuB9knC0rcD7hE 66FVpRyANiJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ8XmNQAKCRAADmhBGVaC FYNzEACPaIIuStNWQbooMdPCkNFqqsgi02PbpU3RhvYL/OWDZeOqKQNz/zXeyVkGktc2KJhXHYa 6l49mND3sgtSPkrnLedQLxNqtaByZFPS/2ww+Sc9q/PpJ5CBgFDCkyI5puXWIC7i5eK8+7mZMWf PDdy6lvycVZS23HEbtuLHH8tKnXwaJnghLnwApEEGRaHboS+FrvDpDqRmID8BAdi7DRDpc9npKw Ehc81xIVc88XMYXatla6jzwcWjhXMKHQ7yRFAQjBdWUVI7vrN/kMO+L+VJf82zcNbWwJO1rfCzw Z/+HObpQMLR+1BH6bJRBs/LqjXlWnj+vx5TX8CT9SRSL/NDhXKmLjp/TltDhaG8v3MksYgtmFp5 220B5WBsBIO+8BUYbeoJdLlu0APcwBw5x6n8++webELRb/OGO7orZzb2TiTw5B5qxMS9trnu2F1 2AaswMWR0EUhA4fmjvBb6YkH/1OsvdwAxhSIuhM2IcQlFrKPhoFBpURTG2cn/8sdkKAYtm+BxvH Sa0e+S4OJHvpwTBcvKHdFjppFSAM8vXNQas2mDb6meVXQoUmgtlXxqy0RS4AZnAREOSSiP4XCIs WwK/LdSlCMRnDu+JyCpdfqbfvatzbLHcltoOxntHc7vRbBvwCP5gmGGbzravgm/J90+S7FjsPiL hJG1Dlma23WPKpA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 idr_alloc_cyclic() is what guarantees that now, not this long-gone trick. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e245c479ef271b6d6b20bcaf468f6de40d62ee00..a7bac93445e2fdbe743b77e66238d652094907cb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -946,15 +946,6 @@ struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, struct kmem_cache *sla spin_lock_init(&stid->sc_lock); INIT_LIST_HEAD(&stid->sc_cp_list); - /* - * It shouldn't be a problem to reuse an opaque stateid value. - * I don't think it is for 4.1. But with 4.0 I worry that, for - * example, a stray write retransmission could be accepted by - * the server when it should have been rejected. Therefore, - * adopt a trick from the sctp code to attempt to maximize the - * amount of time until an id is reused, by ensuring they always - * "increase" (mod INT_MAX): - */ return stid; out_free: kmem_cache_free(slab, stid); From patchwork Mon Mar 3 17:26:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13999315 X-Patchwork-Delegate: cel@kernel.org 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 2E14B23ED77; Mon, 3 Mar 2025 17:26:18 +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=1741022779; cv=none; b=phOKRDp0pIuGZe1A0HWqpo5ABRJdDiSLrp/zXg0qXDgW2tveVibB3yg3RModjPT1wg2cmG2Y/VVNCUMV3xlu6tofUaiwN7JNfsZ5HFuM3Ohq3TJCxWaemEI6JU8xG2LMH4zX0pyCkbAIiDi3xv8DqufbByUmDpBEl40O9bynOBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741022779; c=relaxed/simple; bh=3FsD+s45OjsIemR8o7iKS9geA8NlGbBjBb5uxzlcHL0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AWxk2Yw3ng8FcJH+XOGFVpb0uTVrz+xuNU7/rCsUzOLz2uHZS5kOKqLOyVYj/KjXZMtpP1ZIA2R3IabG9+IrRrUmIHk7Q/dO88pgcGUSA6++FbTutA6foTlR0xvVWKlhuXCncR+r8IiOGWebgfrYdNEzNqx6TY9iFvkoD6I1xDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tvs4Qhdm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Tvs4Qhdm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 100B9C19423; Mon, 3 Mar 2025 17:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741022778; bh=3FsD+s45OjsIemR8o7iKS9geA8NlGbBjBb5uxzlcHL0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Tvs4Qhdmrzes34y/dEXNLiKGl7fI+cexyPuZ9Y99c1LTSAeOKL1be1+GczvMEiLx1 IpG80p2YQCwo7mQt30d8oes61zLANxKoHfmObW0g161t0dIUE2AGPWgpcFb615071s TCES/Z6rWU0BEYcDsC07vdk0dymlc1voAX7pmbGrih10GXNMjQ+PhGFrxG1eA86aRa UiVe5YRejMeyNgbMLKw+nsCi4Q3o/YUXc4XCBFUXPVPcUvIJFEp5gasSCkVFW4Rycb 6288N2EDPTyMjbc9zq7TeHczhPLmLsyWD0aNV3X5aYbnCox4ss4skCOg4WKvDqeKMz HZfPT+iSA0B/g== From: Jeff Layton Date: Mon, 03 Mar 2025 12:26:02 -0500 Subject: [PATCH 4/5] nfsd: clean up if statement in nfsd4_close_open_stateid() Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-nfsd-cleanup-v1-4-14068e8f59c5@kernel.org> References: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> In-Reply-To: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=954; i=jlayton@kernel.org; h=from:subject:message-id; bh=3FsD+s45OjsIemR8o7iKS9geA8NlGbBjBb5uxzlcHL0=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnxeY1wFXoJvoBuxkX8RXg5JR4IG8AbHHA+EZFZ VNE3dh0C4mJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ8XmNQAKCRAADmhBGVaC FSK7D/4uXU94dyrDE6NbpETObgXuOUvAeSY2eHnVHudkx3zmKBgGD740DFOh/wMTZUDKxVPwRIt Tf5esM75x7KQSzARS+0KAitZ5g6d+ktPx/LVRiyJFGObBSLDMTOy8byeAlCPgakSX3ZuLV2nIam CZwNbxhWvb/DvKYV4gCYZINT/yhO92kwb3tEKmfxLWrhXorpfszIKkgf++ltscq8i2bGfMzAo3y aoy3go1cepxHOvkogHo19igPdRX3YjVdsNAGsfCfsfk1ba/+ln+sW0IU1aqSID2V3WE3O534B9U mo7wTH6sTA+dtsS6VccYYeAoTfL10WZ/P4kO3MMnOelqQvYYPV4YxlDF4VBl+F7C/FS0OjXy/sC QN2k2IEuqK+xEGKkAxG9g+4+S+3Zu48b5Dk4uKmYqoA85z2LoTNSrtyRyeu2Q6cR0B5iU7PLjmJ 9LOE6/W4/zcse4HVujN5b5G18qWGs4SWxX19qQojfpuDSrkC6ipvpAvTylDSP3jzQCapfcDvl/C eRw42FyywMOO1bxq9NpL9cQtEngql2r8TbGD3ExPlqGeY15kojVcyEsOuaz9xMraPWCYyow2eCH Pa7AO4wyk2b7zkYVg6akAHn9NZ7WJNvHW7xWNdlLlT9scz8UDAGz2lrXYp0aGmMbhL5sP5lqX9/ fdP0yZeXVDtu16g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Just set unhashed to false in the one case where we return that explicitly, and drop the else. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a7bac93445e2fdbe743b77e66238d652094907cb..1f3e9d42fcd784ea8d101ad3549702a30dfe9058 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -7644,12 +7644,11 @@ static bool nfsd4_close_open_stateid(struct nfs4_ol_stateid *s) list_for_each_entry(stp, &reaplist, st_locks) nfs4_free_cpntf_statelist(clp->net, &stp->st_stid); free_ol_stateid_reaplist(&reaplist); - return false; - } else { - spin_unlock(&clp->cl_lock); - free_ol_stateid_reaplist(&reaplist); - return unhashed; + unhashed = false; } + spin_unlock(&clp->cl_lock); + free_ol_stateid_reaplist(&reaplist); + return unhashed; } /* From patchwork Mon Mar 3 17:26:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13999316 X-Patchwork-Delegate: cel@kernel.org 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 BF787241671; Mon, 3 Mar 2025 17:26:19 +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=1741022779; cv=none; b=e/G07GY8rSMmMpID0AydlxM4ETYuGjMBR7d0M6X5Oz6Bo/8um2Wgv8nhSEkZQgsgteradwOLKDZOA0yAWqjPCPHHGDuXbkBKt6c2pAcVBZjexRAVK8O2HPHs44qR/KTDG/vOhSv13nTo8YR4oNsXkhkndL+2ghLlt8ZiLlGWEMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741022779; c=relaxed/simple; bh=gTD+8LQiPe09wmSKttRLRjWr3KGL3poPlvrnygqxXWs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DSP4zuNPrIXbKBGmlm55U1R6FL3Ykf34EJMuseAE3iLScoNlGHRDcdaToSwypM8kTnEHlUqO3H7oWZZx+kVlUFxA08zm7nmENQT+KJ2CgF/bsdTrWFwMYNwT07AsYbyDPTJzH5lgM8WwNXV4XJaRUxLxNHxdlDtcNH9Rq/A+dkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rd2F2hyo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rd2F2hyo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F121FC4CEE6; Mon, 3 Mar 2025 17:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741022779; bh=gTD+8LQiPe09wmSKttRLRjWr3KGL3poPlvrnygqxXWs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rd2F2hyo5vLpZtBlUe0qODEt21u6M5aDl3WpxW7Noz31Y7Pt2m2hTIvLrt7Pl5jZ4 cwZsuzCvpq9dVXClNP7PJBarPU/Fpjtpp/5ii3Qdkme3moN0zMetbYfsUzVMRzAxaO qXuI+dl3664a+8fqwrtqsCF/xi1tj7gbrmf3gvkgjboOVovNIss8HOZXwf3Bj8s9Oa yHys+RfiuDD6ZB5kddPCQOwULDEVjxprWePWPnuIoJbzzlTxSITnboC/1x6vD20Qpv S1dqFf1sLhr87LQrLU/BwLsnw43GZmhXBSJnbA8KLR9AVkMfDntXWvTLKWHns1Ureh 6jfNPK7F0fsZQ== From: Jeff Layton Date: Mon, 03 Mar 2025 12:26:03 -0500 Subject: [PATCH 5/5] nfsd: use a long for the count in nfsd4_state_shrinker_count() Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-nfsd-cleanup-v1-5-14068e8f59c5@kernel.org> References: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> In-Reply-To: <20250303-nfsd-cleanup-v1-0-14068e8f59c5@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=790; i=jlayton@kernel.org; h=from:subject:message-id; bh=gTD+8LQiPe09wmSKttRLRjWr3KGL3poPlvrnygqxXWs=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnxeY2imXWq1pMPKaiX6eH1alev3H5J7YiMI+Wl XjlIRwEr8KJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ8XmNgAKCRAADmhBGVaC FZV2EACfaphCJXUSUarWKsWVvZA1UTZJUJjQShT47sKIJxU1gpScLDbmMfUOuPxGXHd88IUXypd kwGp4e0Tcl6GFfJZMLX5GjILKlXsYpcOGx2nvteM8gFSxwnpQWbkN0Uh9mpo4mthMgQgDtc5neX UtCO/VyLfmMJQve5ZZwuSM7s1rLzILkEuBqGcAjN1m9LWeld1yippsaV197h+ISBpn4+dyEYASE tHnSkYNP7L/90YbHY61zVJrrauD8KH3FqMQ9OkF2r+T73DcKtGdJIOAQs+7cCcLxSx/lU422w/6 MGbfW30ZNzO0QJqbDIjbRugBwWMUZJnLZG66CBVFOrKBl4PMei83LCGZk5p0fcgHVFObqTWr8B2 k7OCxGaF2y3cW+CQBVJldGlEciElcCD0Ge6S2vDmVRDgWcSqAS23juXGSvc+/eq8sVNMBcZY7Ri DIFSsn+3C75J/Ajm0GbRHupbkmS/fDrEODYmT1JE7wJdnqpbONwY0J1NuijB2A0obVp9+DyGA48 6PVNNA/rU2YssHm38Q4kyn3Q3cZXWveriZNYaYG+bPyOXw6qXca9+oNl1sfJBw31MQ3xjhpVFoF 3SIsV+I/0hdOkLBIg5DbxHLbEVgNNwF5plDglZ1v9ldlK1MXIfFkEbFkjwK3oNqSbi0YAV39qGu i6Dc1siB2lfKONA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 If there are no courtesy clients then the return value from the atomic_long_read() could overflow an int. Use a long to store the value instead. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1f3e9d42fcd784ea8d101ad3549702a30dfe9058..aa0afd1b19a254686ef1f15f5f11db1c79d69096 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4819,7 +4819,7 @@ nfsd4_init_slabs(void) static unsigned long nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc) { - int count; + long count; struct nfsd_net *nn = shrink->private_data; count = atomic_read(&nn->nfsd_courtesy_clients);