summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2016-07-08 20:50:44 +0000
committerngie <ngie@FreeBSD.org>2016-07-08 20:50:44 +0000
commitee3e200276b0f5bb9f2ac8fe92f747892fc807e1 (patch)
tree8b9b1dc58ad68b04679cee97c7150a21182a5017
parent7a6ae0468c49830719b2f15365e4d729b4f7361b (diff)
downloadFreeBSD-src-ee3e200276b0f5bb9f2ac8fe92f747892fc807e1.zip
FreeBSD-src-ee3e200276b0f5bb9f2ac8fe92f747892fc807e1.tar.gz
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
-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