Add missing break in lock_partialfilelock(..) with NFS_RESERR
ClosedPublic
Actions

Authored by ngie on May 29 2016, 5:42 AM.

Details

Reviewers: None
Commits: rS301871: Add missing break in lock_partialfilelock(..) with NFS_RESERR

Summary

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
MFC after: 2 weeks
Reported by: Coverity
CID: 1008161, 1304956
Sponsored by: EMC / Isilon Storage Division

Test Plan

buildworld + buildkernel over NFS as server (amd64) and client (i386) is ok
TODO: run some locking tests over NFS, likely with NFSv4 to ensure locking is 100% sane.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ngie updated this revision to Diff 17053.May 29 2016, 5:42 AM

ngie retitled this revision from to Add missing break in lock_partialfilelock(..) with NFS_RESERR.

ngie updated this object.

ngie edited the test plan for this revision. (Show Details)

ngie added subscribers: alfred, markj, rmacklem.

Herald added a subscriber: imp. · View Herald TranscriptMay 29 2016, 5:42 AM

ngie updated this object.May 29 2016, 5:43 AM

Run your locking tests over NFSv3. NFSv4 does not use rpc.lockd
(one of its major features, imho).

ngie updated this object.Jun 10 2016, 4:31 PM

I know nothing about the NLM (rpc.lockd protocol). However, this looks correct to
me. (I can't think of why the original author would have wanted it to fall through.)

Closed by commit rS301871: Add missing break in lock_partialfilelock(..) with NFS_RESERR (authored by ngie). · Explain WhyJun 13 2016, 11:19 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

usr.sbin/

rpc.lockd/

lockd_lock.c

1 line

Diff 17554

View Options

head/usr.sbin/rpc.lockd/lockd_lock.c

Add missing break in lock_partialfilelock(..) with NFS_RESERRClosedPublicActions