From 7c98c921f9b7e3a200c9a2641f2f3b8723fcd1d7 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 13 Jun 2016 11:19:06 +0000 Subject: [PATCH] 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 --- usr.sbin/rpc.lockd/lockd_lock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c index 735d97979a69..59a312df3a66 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;