From 0fe9f1d1916aebb27de47bcb661765db78c78590 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 8 Jul 2016 21:20:09 +0000 Subject: [PATCH] MFstable/10 r302455: 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 git-svn-id: svn://svn.freebsd.org/base/stable/9@302458 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- 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 5900bfa92..62a079528 100644 --- a/usr.sbin/rpc.lockd/lockd_lock.c +++ b/usr.sbin/rpc.lockd/lockd_lock.c @@ -1428,6 +1428,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; -- 2.45.0