lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 717/913] NFSD: Fix nfsd_breaker_owns_lease() return values
    Date
    From: Chuck Lever <chuck.lever@oracle.com>

    [ Upstream commit 50719bf3442dd6cd05159e9c98d020b3919ce978 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfs4state.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
    index db4a47a280dc..181bc3d9f566 100644
    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -4693,6 +4693,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;
    @@ -4700,11 +4708,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;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-06 02:43    [W:5.051 / U:0.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site