]> git.ipfire.org Git - thirdparty/linux.git/commit
lockd: Move xdr.h from include/linux/lockd/ to fs/lockd/
authorChuck Lever <chuck.lever@oracle.com>
Wed, 28 Jan 2026 15:19:32 +0000 (10:19 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 30 Mar 2026 01:25:09 +0000 (21:25 -0400)
commit615384a24b1e6b0f091ebc1dfbf7ec8b4c27fa81
tree7da844897c4ffe5fe8c53dc9682640bb6029790d
parent236f3171ac690f632e13d391f47c68c3a8519bd2
lockd: Move xdr.h from include/linux/lockd/ to fs/lockd/

The lockd subsystem unnecessarily exposes internal NLM XDR type
definitions through the global include path. These definitions
are not used by any code outside fs/lockd/, making them
inappropriate for include/linux/lockd/.

Moving xdr.h to fs/lockd/ narrows the API surface and clarifies
that these types are internal implementation details. The
comment in linux/lockd/bind.h stating xdr.h was needed for
"xdr-encoded error codes" is stale: no lockd API consumers use
those codes.

Forward declarations for struct nfs_fh and struct file_lock are
added to bind.h because their definitions were previously pulled
in transitively through xdr.h. Additionally, nfs3proc.c and
proc.c need explicit includes of filelock.h for FL_CLOSE and
for accessing struct file_lock members, respectively.

Built and tested with lockd client/server operations. No
functional change.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/lockd/lockd.h
fs/lockd/xdr.h [moved from include/linux/lockd/xdr.h with 96% similarity]
fs/nfs/nfs3proc.c
fs/nfs/proc.c
include/linux/lockd/bind.h