svn commit: r301871 - head/usr.sbin/rpc.lockd
Garrett Cooper
ngie at FreeBSD.org
Mon Jun 13 11:19:07 UTC 2016
Author: ngie
Date: Mon Jun 13 11:19:06 2016
New Revision: 301871
URL: https://svnweb.freebsd.org/changeset/base/301871
Log:
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
Differential Revision: https://reviews.freebsd.org/D6622
Reviewed by: rmacklem
Approved by: re (gjb)
Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull http://nfsv4.bullopensource.org/tools/tests/locktest.php
MFC after: 2 weeks
Reported by: Coverity
CID: 1008161, 1304956
Sponsored by: EMC / Isilon Storage Division
Modified:
head/usr.sbin/rpc.lockd/lockd_lock.c
Modified: head/usr.sbin/rpc.lockd/lockd_lock.c
==============================================================================
--- head/usr.sbin/rpc.lockd/lockd_lock.c Mon Jun 13 10:53:34 2016 (r301870)
+++ head/usr.sbin/rpc.lockd/lockd_lock.c Mon Jun 13 11:19:06 2016 (r301871)
@@ -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;
More information about the svn-src-all
mailing list