system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-04 10:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Fix nfsd_breaker_owns_lease() return values

Browse source 
These have been incorrect since the function was introduced.

A proper kerneldoc comment is added since this function, though
static, is part of an external interface.

Reported-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2022-02-14 15:30:13 -05:00
parent 35aff0678f
commit 50719bf344
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/nfsd/nfs4state.c
View file

@ -4711,6 +4711,14 @@ nfsd_break_deleg_cb(struct file_lock *fl)
return ret; return ret;
} }
/**
* nfsd_breaker_owns_lease - Check if lease conflict was resolved
* @fl: Lock state to check
*
* Return values:
* %true: Lease conflict was resolved
* %false: Lease conflict was not resolved.
*/
static bool nfsd_breaker_owns_lease(struct file_lock *fl) static bool nfsd_breaker_owns_lease(struct file_lock *fl)
{ {
struct nfs4_delegation *dl = fl->fl_owner; struct nfs4_delegation *dl = fl->fl_owner;
@ -4718,11 +4726,11 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)
struct nfs4_client *clp; struct nfs4_client *clp;
if (!i_am_nfsd()) if (!i_am_nfsd())
return NULL; return false;
rqst = kthread_data(current); rqst = kthread_data(current);
/* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ /* Note rq_prog == NFS_ACL_PROGRAM is also possible: */
if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4) if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4)
return NULL; return false;
clp = *(rqst->rq_lease_breaker); clp = *(rqst->rq_lease_breaker);
return dl->dl_stid.sc_client == clp; return dl->dl_stid.sc_client == clp;
} }