diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2022-02-14 15:30:13 -0500 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2022-03-11 10:25:16 -0500 |
| commit | 50719bf3442dd6cd05159e9c98d020b3919ce978 (patch) | |
| tree | 9b3bcf0972a33733ec9195bb10a6fad0b7ea3c8d /fs/nfsd | |
| parent | 35aff0678f99b0623bb72d50112de9e163a19559 (diff) | |
| download | linux-50719bf3442dd6cd05159e9c98d020b3919ce978.tar.bz2 | |
NFSD: Fix nfsd_breaker_owns_lease() return values
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f932bcd72421..234e852fcdfa 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4711,6 +4711,14 @@ nfsd_break_deleg_cb(struct file_lock *fl) 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) { 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; if (!i_am_nfsd()) - return NULL; + return false; rqst = kthread_data(current); /* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4) - return NULL; + return false; clp = *(rqst->rq_lease_breaker); return dl->dl_stid.sc_client == clp; } |