diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-17 09:56:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-17 09:56:01 -0700 |
| commit | 1b66c114d161a457897d269420c74620c032135c (patch) | |
| tree | 29f2a540ef6ebcc50b4ca6450ad22db47cbaf603 /fs/lockd | |
| parent | cba582631ee40772c6dbe24e945b9173572dfca0 (diff) | |
| parent | 21a3f3328972bdb774c62b301a715b5cebf03fa2 (diff) | |
| download | linux-stable-1b66c114d161a457897d269420c74620c032135c.tar.gz linux-stable-1b66c114d161a457897d269420c74620c032135c.tar.bz2 linux-stable-1b66c114d161a457897d269420c74620c032135c.zip | |
Merge tag 'nfsd-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- A collection of minor bug fixes
* tag 'nfsd-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: Remove open coding of string copy
SUNRPC: Fix trace_svc_register() call site
SUNRPC: always free ctxt when freeing deferred request
SUNRPC: double free xprt_ctxt while still in use
SUNRPC: Fix error handling in svc_setup_socket()
SUNRPC: Fix encoding of accepted but unsuccessful RPC replies
lockd: define nlm_port_min,max with CONFIG_SYSCTL
nfsd: define exports_proc_ops with CONFIG_PROC_FS
SUNRPC: Avoid relying on crypto API to derive CBC-CTS output IV
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index bb94949bc223..04ba95b83d16 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -77,9 +77,9 @@ static const unsigned long nlm_grace_period_min = 0; static const unsigned long nlm_grace_period_max = 240; static const unsigned long nlm_timeout_min = 3; static const unsigned long nlm_timeout_max = 20; -static const int nlm_port_min = 0, nlm_port_max = 65535; #ifdef CONFIG_SYSCTL +static const int nlm_port_min = 0, nlm_port_max = 65535; static struct ctl_table_header * nlm_sysctl_table; #endif |