Date: Fri, 8 Jul 2016 21:20:09 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r302458 - stable/9/usr.sbin/rpc.lockd Message-ID: <201607082120.u68LK9Tp069362@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Jul 8 21:20:09 2016 New Revision: 302458 URL: https://svnweb.freebsd.org/changeset/base/302458 Log: 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 Modified: stable/9/usr.sbin/rpc.lockd/lockd_lock.c Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/rpc.lockd/ (props changed) Modified: stable/9/usr.sbin/rpc.lockd/lockd_lock.c ============================================================================== --- stable/9/usr.sbin/rpc.lockd/lockd_lock.c Fri Jul 8 21:19:48 2016 (r302457) +++ stable/9/usr.sbin/rpc.lockd/lockd_lock.c Fri Jul 8 21:20:09 2016 (r302458) @@ -1428,6 +1428,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607082120.u68LK9Tp069362>