diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2026-05-12 14:14:02 -0400 |
|---|---|---|
| committer | Chuck Lever <cel@kernel.org> | 2026-06-09 16:32:59 -0400 |
| commit | 82452a0254deb5c602c0d8ec288d21d381dd72b3 (patch) | |
| tree | 47826c242a36419bdd4da8d859ad86db0f56a830 /fs/lockd | |
| parent | 9783a82b75feb3cf1d2c6f31194e756fb0c13fca (diff) | |
| download | linux-next-82452a0254deb5c602c0d8ec288d21d381dd72b3.tar.gz linux-next-82452a0254deb5c602c0d8ec288d21d381dd72b3.zip | |
lockd: Use xdrgen XDR functions for the NLMv3 CANCEL_RES procedure
Continue the xdrgen migration by converting NLMv3 CANCEL_RES,
the callback that a remote NLM uses to return async CANCEL
results to this lockd. The procedure now uses
nlm_svc_decode_nlm_res and nlm_svc_encode_void, generated
from the NLM version 3 protocol specification.
Setting pc_argzero to zero is safe because the generated
decoder fills the argp->xdrgen subfields before the procedure
runs, so the zeroing memset performed by the dispatch layer
is no longer needed.
Setting pc_xdrressize to XDR_void reflects that CANCEL_RES, as
a callback, returns no data; the previous value of St
over-reserved a status word in the reply buffer.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svcproc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index c86ba0b94793..e7d399afbe83 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -1290,15 +1290,15 @@ static const struct svc_procedure nlmsvc_procedures[24] = { .pc_xdrressize = XDR_void, .pc_name = "LOCK_RES", }, - [NLMPROC_CANCEL_RES] = { - .pc_func = nlmsvc_proc_null, - .pc_decode = nlmsvc_decode_void, - .pc_encode = nlmsvc_encode_void, - .pc_argsize = sizeof(struct lockd_res), - .pc_argzero = sizeof(struct lockd_res), - .pc_ressize = sizeof(struct nlm_void), - .pc_xdrressize = St, - .pc_name = "CANCEL_RES", + [NLM_CANCEL_RES] = { + .pc_func = nlmsvc_proc_null, + .pc_decode = nlm_svc_decode_nlm_res, + .pc_encode = nlm_svc_encode_void, + .pc_argsize = sizeof(struct nlm_res), + .pc_argzero = 0, + .pc_ressize = 0, + .pc_xdrressize = XDR_void, + .pc_name = "CANCEL_RES", }, [NLMPROC_UNLOCK_RES] = { .pc_func = nlmsvc_proc_null, |