svn commit: r334635 - stable/10/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Mon Jun  4 20:55:25 2018
New Revision: 334635
URL: https://svnweb.freebsd.org/changeset/base/334635

Log:
  MFC: r334252
  Fix the sleep event for layout recall.
  
  The sleep for I/O completion during an NFSv4.1 pNFS layout recall used
  the wrong event value and could result in the "[nfscl]" thread hung
  for the mount.
  This patch fixes the event to be the correct.
  This bug will only affect NFSv4.1 pnfs mounts and only when the server
  does a layout recall callback, so it won't affect many. Without the patch,
  a mount without the "pnfs" option will avoid the problem.
  Found during testing of the pNFS server.

Modified:
  stable/10/sys/fs/nfsclient/nfs_clstate.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clstate.c	Mon Jun  4 20:47:37 2018	(r334634)
+++ stable/10/sys/fs/nfsclient/nfs_clstate.c	Mon Jun  4 20:55:25 2018	(r334635)
@@ -2719,7 +2719,7 @@ tryagain2:
 				     NFSV4LOCK_LOCK) != 0) {
 					lyp->nfsly_lock.nfslock_lock |=
 					    NFSV4LOCK_WANTED;
-					(void)nfsmsleep(&lyp->nfsly_lock,
+					nfsmsleep(&lyp->nfsly_lock.nfslock_lock,
 					    NFSCLSTATEMUTEXPTR, PZERO, "nfslyp",
 					    NULL);
 					goto tryagain2;