]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
lockd: Rename struct nlm_lock to lockd_lock
authorChuck Lever <chuck.lever@oracle.com>
Tue, 12 May 2026 18:13:43 +0000 (14:13 -0400)
committerChuck Lever <cel@kernel.org>
Tue, 9 Jun 2026 20:32:59 +0000 (16:32 -0400)
commitef66678dd48bf4f266ae70562df65813a041e29a
tree8d103f4695f352093ab65c6a6018746a30f24b65
parentb3ef4d4688ebb78ed46d9c3adc6f2b82f1e05721
lockd: Rename struct nlm_lock to lockd_lock

A subsequent patch will convert fs/lockd/svcproc.c to use
machine-generated XDR encoding and decoding functions in a
manner similar to fs/lockd/svc4proc.c. Machine-generated
types derived from the NLM specification will conflict with
the internal types of the same name.

Rename the internal struct nlm_lock type to lockd_lock to
avoid such naming conflicts.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
12 files changed:
fs/lockd/clnt4xdr.c
fs/lockd/clntlock.c
fs/lockd/clntproc.c
fs/lockd/clntxdr.c
fs/lockd/lockd.h
fs/lockd/svc4proc.c
fs/lockd/svclock.c
fs/lockd/svcproc.c
fs/lockd/svcsubs.c
fs/lockd/trace.h
fs/lockd/xdr.c
fs/lockd/xdr.h