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

Pull nfsd fixes from Chuck Lever:
 "Regressions:

   - Tighten bounds checking for sunrpc cache hash tables

   - Don't report key material in the ftrace log

  Stable fix:

   - Fix lockd's implementation of the NLM TEST procedure"

* tag 'nfsd-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  lockd: fix TEST handling when not all permissions are available.
  NFSD: Report whether fh_key was actually updated
  sunrpc: prevent out-of-bounds read in __cache_seq_start()

diff --cc fs/lockd/svclock.c
index b98b1d0ada35f052824e03cbb5a2ca1751712201,44bc2083706228b5899765790478e6468882bef5..f4520149d6d79428e9454d4e3306ca7b841380c1
--- 1/fs/lockd/svclock.c
--- 2/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@@ -613,10 -613,9 +613,9 @@@ nlmsvc_testlock(struct svc_rqst *rqstp
                struct nlm_lock *conflock)
  {
        int                     error;
-       int                     mode;
        __be32                  ret;
  
 -      dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
 +      dprintk("lockd: nlmsvc_testlock(%s/%llu, ty=%d, %Ld-%Ld)\n",
                                nlmsvc_file_inode(file)->i_sb->s_id,
                                nlmsvc_file_inode(file)->i_ino,
                                lock->fl.c.flc_type,

diff --cc fs/lockd/svcsubs.c
Simple merge