Changes in lockd.h

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/lockd/lockd.h

36d179fd6bea35698d53444b7bd3025fa3788266 - Merge tag 'nfsd-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Mon, 20 Apr 2026 19:44:02 +0200

Merge tag 'nfsd-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linuxPull nfsd updates from Chuck Lever: - filehandle signing to defend against filehandle-guessing attacks (Benjamin Coddington) The server now appends a SipHash-2-4 MAC to each filehandle when the new "sign_fh" export option is enabled. NFSD then verifies filehandles received from clients against the expected MAC; mismatches return NFS error STALE - convert the entire NLMv4 server-side XDR layer from hand-written C to xdrgen-generated code, spanning roughly thirty patches (Chuck Lever) XDR functions are generally boilerplate code and are easy to get wrong. The goals of this conversion are improved memory safety, lower maintenance burden, and groundwork for eventual Rust code generation for these functions. - improve pNFS block/SCSI layout robustness with two related changes (Dai Ngo) SCSI persistent reservation fencing is now tracked per client and per device via an xarray, to avoid both redundant preempt operations on devices already fenced and a potential NFSD deadlock when all nfsd threads are waiting for a layout return. - scalability and infrastructure improvements Sincere thanks to all contributors, reviewers, testers, and bug reporters who participated in the v7.1 NFSD development cycle.* tag 'nfsd-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (83 commits) NFSD: Docs: clean up pnfs server timeout docs nfsd: fix comment typo in nfsxdr nfsd: fix comment typo in nfs3xdr NFSD: convert callback RPC program to per-net namespace NFSD: use per-operation statidx for callback procedures svcrdma: Use contiguous pages for RDMA Read sink buffers SUNRPC: Add svc_rqst_page_release() helper SUNRPC: xdr.h: fix all kernel-doc warnings svcrdma: Factor out WR chain linking into helper svcrdma: Add Write chunk WRs to the RPC's Send WR chain svcrdma: Clean up use of rdma->sc_pd->device svcrdma: Clean up use of rdma->sc_pd->device in Receive paths svcrdma: Add fair queuing for Send Queue access SUNRPC: Optimize rq_respages allocation in svc_alloc_arg SUNRPC: Track consumed rq_pages entries svcrdma: preserve rq_next_page in svc_rdma_save_io_pages SUNRPC: Handle NULL entries in svc_rqst_release_pages SUNRPC: Allocate a separate Reply page array SUNRPC: Tighten bounds checking in svc_rqst_replace_page NFSD: Sign filehandles ... List of files: /linux/fs/lockd/lockd.h

4f406a2c1e23b03c8f5920318a0effb15ba238da - lockd: Remove dead code from fs/lockd/xdr4.c

Tue, 17 Feb 2026 23:07:21 +0100

lockd: Remove dead code from fs/lockd/xdr4.cNow that all NLMv4 server-side procedures use XDR encoder anddecoder functions generated by xdrgen, the hand-written code infs/lockd/xdr4.c is no longer needed. This file contained theoriginal XDR processing logic that has been systematicallyreplaced throughout this series.Remove the file and its Makefile reference to eliminate thedead code. The helper function nlm4svc_set_file_lock_range()is still needed by the generated code, so move it to xdr4.has an inline function where it remains accessible.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

45cd458b57feeec639af3d7da05ce8c290d0179b - lockd: Relocate svc_version definitions to XDR layer

Wed, 28 Jan 2026 16:19:35 +0100

lockd: Relocate svc_version definitions to XDR layerPublic RPC server interfaces become cluttered when internalXDR implementation details leak into them. The procedure count,maximum XDR buffer size, and per-CPU call counters serve nopurpose outside the code that encodes and decodes NLM protocolmessages. Exposing these values through global headers createsunnecessary coupling between the RPC dispatch logic and theXDR layer.Relocating the svc_version structure definitions confines thisimplementation information to the files where XDR encoding anddecoding occur. In svc.c, the buffer size computation now readsvs_xdrsize from the version structures rather than relying on apreprocessor constant. This calculation occurs at serviceinitialization, after the linker has resolved the versionstructure definitions. The dispatch function becomes non-staticbecause both the version structures and the dispatcher reside indifferent translation units.The NLMSVC_XDRSIZE macro is removed from xdr.h because buffersize is now computed from the union of XDR argument and resultstructures, matching the pattern used in other RPC services.Version 1 and 3 share the same procedure table but maintainseparate counter arrays. Version 4 remains separate due to itsdistinct procedure definitions.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

b3f76a9b13f014edcba9eaae2bc09a6af7267cee - lockd: Move nlm4svc_set_file_lock_range()

Wed, 28 Jan 2026 16:19:34 +0100

lockd: Move nlm4svc_set_file_lock_range()Both client-side and server-side NLMv4 code convert lock byte rangesfrom the wire format (start, length) to the kernel's file_lock format(start, end). The current nlm4svc_set_file_lock_range() performs thisconversion, but the "svc" prefix incorrectly suggests server-only use,and client code must include server-internal headers to access it.Rename to lockd_set_file_lock_range4() and relocate to the sharedlockd.h header, making it accessible to both client and server code.This eliminates the need for client code to include xdr4.h, reducingcoupling between the XDR implementation files.While relocating the function, add input validation: clamp thestarting offset to OFFSET_MAX before use. Without this, a malformedlock request with off > OFFSET_MAX results in fl_start > fl_end,violating file_lock invariants and potentially causing incorrectlock conflict detection.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

5829352e568d24dd04ae112128a4f44748d073bc - lockd: Make linux/lockd/nlm.h an internal header

Wed, 28 Jan 2026 16:19:33 +0100

lockd: Make linux/lockd/nlm.h an internal headerThe NLM protocol constants and status codes in nlm.h are neededonly by lockd's internal implementation. NFS client code andNFSD interact with lockd through the stable API in bind.h andhave no direct use for protocol-level definitions.Exposing these definitions globally via bind.h creates unnecessarycoupling between lockd internals and its consumers. Moving nlm.hfrom include/linux/lockd/ to fs/lockd/ clarifies the API boundary:bind.h provides the lockd service interface, while nlm.h remainsavailable only to code within fs/lockd/ that implements theprotocol.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

615384a24b1e6b0f091ebc1dfbf7ec8b4c27fa81 - lockd: Move xdr.h from include/linux/lockd/ to fs/lockd/

Wed, 28 Jan 2026 16:19:32 +0100

lockd: Move xdr.h from include/linux/lockd/ to fs/lockd/The lockd subsystem unnecessarily exposes internal NLM XDR typedefinitions through the global include path. These definitionsare not used by any code outside fs/lockd/, making theminappropriate for include/linux/lockd/.Moving xdr.h to fs/lockd/ narrows the API surface and clarifiesthat these types are internal implementation details. Thecomment in linux/lockd/bind.h stating xdr.h was needed for"xdr-encoded error codes" is stale: no lockd API consumers usethose codes.Forward declarations for struct nfs_fh and struct file_lock areadded to bind.h because their definitions were previously pulledin transitively through xdr.h. Additionally, nfs3proc.c andproc.c need explicit includes of filelock.h for FL_CLOSE andfor accessing struct file_lock members, respectively.Built and tested with lockd client/server operations. Nofunctional change.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

236f3171ac690f632e13d391f47c68c3a8519bd2 - lockd: Remove lockd/debug.h

Wed, 28 Jan 2026 16:19:31 +0100

lockd: Remove lockd/debug.hThe lockd include structure has unnecessary indirection. The headerinclude/linux/lockd/debug.h is consumed only by fs/lockd/lockd.h,creating an extra compilation dependency and making the code harderto navigate.Fold the debug.h definitions directly into lockd.h and remove thenow-redundant header. This reduces the include tree depth and makesthe debug-related definitions easier to find when working on lockdinternals.Build-tested with lockd built as module and built-in.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h

2c562c6e6715619ce34bb37d8a0a5e40fdcc7a44 - lockd: Relocate include/linux/lockd/lockd.h

Wed, 28 Jan 2026 16:19:30 +0100

lockd: Relocate include/linux/lockd/lockd.hHeaders placed in include/linux/ form part of the kernel'sinternal API and signal to subsystem maintainers that otherparts of the kernel may depend on them. By moving lockd.hinto fs/lockd/, lockd becomes a more self-contained modulewhose internal interfaces are clearly distinguished from itspublic contract with the rest of the kernel. This relocationaddresses a long-standing XXX comment in the header itselfthat acknowledged the file's misplacement. Future changes tolockd internals can now proceed with confidence that externalconsumers are not inadvertently coupled to implementationdetails.Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever List of files: /linux/fs/lockd/lockd.h