svn commit: r302455 - stable/10/usr.sbin/rpc.lockd

[Garrett Cooper]

Author: ngie
Date: Fri Jul  8 20:50:44 2016
New Revision: 302455
URL: https://svnweb.freebsd.org/changeset/base/302455

Log:
  MFC r301871:
  
  Add missing break in lock_partialfilelock(..) with NFS_RESERR
  
  This will help ensure that the right error is trickled up when the
  function is called if the lock status is NFS_RESERR
  
  Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull http://nfsv4.bullopensource.org/tools/tests/locktest.php
  CID: 1008161, 1304956

Modified:
  stable/10/usr.sbin/rpc.lockd/lockd_lock.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.lockd/lockd_lock.c
==============================================================================
--- stable/10/usr.sbin/rpc.lockd/lockd_lock.c	Fri Jul  8 20:40:50 2016	(r302454)
+++ stable/10/usr.sbin/rpc.lockd/lockd_lock.c	Fri Jul  8 20:50:44 2016	(r302455)
@@ -1426,6 +1426,7 @@ lock_partialfilelock(struct file_lock *f
 		break;
 	case NFS_RESERR:
 		retval = PFL_NFSRESERR;
+		break;
 	default:
 		debuglog("Unmatched lnlstatus %d\n");
 		retval = PFL_NFSDENIED_NOLOCK;