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

diff --combined fs/lockd/svc.c
index bb94949bc2235d6fc4a8654b3f071ad4a9b13528,fe2f6dd9a8743b26022cacbaf47e354219efbcc9..04ba95b83d16832680b03cfc3e096987a55d7f19
--- 1/fs/lockd/svc.c
--- 2/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@@ -77,9 -77,9 +77,9 @@@ static const unsigned long    nlm_grace_pe
  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
  
@@@ -510,6 -510,24 +510,6 @@@ static struct ctl_table nlm_sysctls[] 
        { }
  };
  
 -static struct ctl_table nlm_sysctl_dir[] = {
 -      {
 -              .procname       = "nfs",
 -              .mode           = 0555,
 -              .child          = nlm_sysctls,
 -      },
 -      { }
 -};
 -
 -static struct ctl_table nlm_sysctl_root[] = {
 -      {
 -              .procname       = "fs",
 -              .mode           = 0555,
 -              .child          = nlm_sysctl_dir,
 -      },
 -      { }
 -};
 -
  #endif        /* CONFIG_SYSCTL */
  
  /*
@@@ -626,7 -644,7 +626,7 @@@ static int __init init_nlm(void
  
  #ifdef CONFIG_SYSCTL
        err = -ENOMEM;
 -      nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root);
 +      nlm_sysctl_table = register_sysctl("fs/nfs", nlm_sysctls);
        if (nlm_sysctl_table == NULL)
                goto err_sysctl;
  #endif