From mboxrd@z Thu Jan 1 00:00:00 1970 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 476A429E115 for ; Fri, 23 Jan 2026 18:53:26 +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=1769194406; cv=none; b=u9MRxXv1/HZc1o91UoLD6nnDg+GwMEcTBQKrR1cqejpBv07mdkvjrDakr56IyMm+RNrxZ2uAu3M5xLdn8KN+MbTMHJoGovXdEzTESKL7yMy32DVStpU6nPe9Sv1ttFCiXJaxtRRQJo4TtegZsAi5GTMJ6ixLbFl5lG4DXhLld7o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769194406; c=relaxed/simple; bh=OeUVR5ZwfwqPzgorJHA6aCybp2CHmImwRwenuGSa1zs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=turt+vaxtK/8bme4OHTDY/MV3ZmcQvR98loXTkNCv8z5rCrtSunIayaWqFtYeTD4u6kQUDsXQw5yptzcCKTaQBaQ3I3aGJjDzJmE5z14/XUEzF8RHry6NrdS5WjwlOGLku2J/HvmNXoyA1e89YBVmuAbTJ49KM2rBbTR9yK1mZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pJZW3nE5; 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="pJZW3nE5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95A6EC4CEF1; Fri, 23 Jan 2026 18:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769194406; bh=OeUVR5ZwfwqPzgorJHA6aCybp2CHmImwRwenuGSa1zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pJZW3nE5VgOpcide7Kx8gn0f1Jm3Udsou9k/HtpUCSvrblF27VkyNp8oGf7SoYocc pnYSYkU+KcIoYPCO2Z9lg9Jxw29EVH57eT043/IhMX6OpwkXDpCKe0Wi3p8nhxAp1N Bx6n76haRRiIZJyBXvGbNIcxwjk8iz8MGy6E8/KMgnEDuTkfkMaGxYostWwmEp2DbU +UotQdQG9UdpLP4B9klWUiputWtlJZ1+4WK0wV93sPNGZRj85JBLw0kdBohAUuh66Z 6XhY2GI+G1Xitx6QoNLTG9bzrMGzcf/t/ST3CMGzb0vIfQWKmR+rRdBT+FgGX7TqBl htvzUO3p+eXFQ== From: Chuck Lever To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: , Chuck Lever Subject: [PATCH v2 29/42] lockd: Use xdrgen XDR functions for the NLMv4 CANCEL_RES procedure Date: Fri, 23 Jan 2026 13:52:46 -0500 Message-ID: <20260123185259.1215767-30-cel@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260123185259.1215767-1-cel@kernel.org> References: <20260123185259.1215767-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Convert the CANCEL_RES procedure to use xdrgen functions nlm4_svc_decode_nlm4_res and nlm4_svc_encode_void. CANCEL_RES is a callback procedure where the client sends cancel results back to the server after an async CANCEL request. The pc_argzero field is set to zero because xdrgen decoders reliably initialize all arguments, making the early defensive memset unnecessary. This change also corrects the pc_xdrressize field, which previously contained a placeholder value. Signed-off-by: Chuck Lever --- fs/lockd/svc4proc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index fce3defd1cb3..d4b624e1e318 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -1239,15 +1239,15 @@ static const struct svc_procedure nlm4svc_procedures[24] = { .pc_xdrressize = XDR_void, .pc_name = "LOCK_RES", }, - [NLMPROC_CANCEL_RES] = { - .pc_func = nlm4svc_proc_null, - .pc_decode = nlm4svc_decode_void, - .pc_encode = nlm4svc_encode_void, - .pc_argsize = sizeof(struct nlm_res), - .pc_argzero = sizeof(struct nlm_res), - .pc_ressize = sizeof(struct nlm_void), - .pc_xdrressize = St, - .pc_name = "CANCEL_RES", + [NLMPROC4_CANCEL_RES] = { + .pc_func = nlm4svc_proc_null, + .pc_decode = nlm4_svc_decode_nlm4_res, + .pc_encode = nlm4_svc_encode_void, + .pc_argsize = sizeof(struct nlm4_res), + .pc_argzero = 0, + .pc_ressize = 0, + .pc_xdrressize = XDR_void, + .pc_name = "CANCEL_RES", }, [NLMPROC_UNLOCK_RES] = { .pc_func = nlm4svc_proc_null, -- 2.52.0