summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2016-06-13 11:19:06 +0000
committerngie <ngie@FreeBSD.org>2016-06-13 11:19:06 +0000
commit7c98c921f9b7e3a200c9a2641f2f3b8723fcd1d7 (patch)
tree79c30f85810938d1ec20caae04650c1ff55404af
parentc862120336bfb1c36fe50f6fd462a8c86967e33d (diff)
downloadFreeBSD-src-7c98c921f9b7e3a200c9a2641f2f3b8723fcd1d7.zip
FreeBSD-src-7c98c921f9b7e3a200c9a2641f2f3b8723fcd1d7.tar.gz
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
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 735d979..59a312d 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1426,6 +1426,7 @@ lock_partialfilelock(struct file_lock *fl)
break;
case NFS_RESERR:
retval = PFL_NFSRESERR;
+ break;
default:
debuglog("Unmatched lnlstatus %d\n");
retval = PFL_NFSDENIED_NOLOCK;
OpenPOWER on IntegriCloud