lkml.org 
[lkml]   [2010]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[34/93] NFSv4: Ensure that the NFSv4 locking can recover from stateid errors
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit 2bee72a6aa1e6d0a4f5da56217f0d0bbbdd0d9a3 upstream.

    In most cases, we just want to mark the lock_stateid sequence id as being
    uninitialised.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/nfs4proc.c | 19 +++++++++++++++++++
    1 file changed, 19 insertions(+)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -3978,6 +3978,22 @@ static const struct rpc_call_ops nfs4_lo
    .rpc_release = nfs4_lock_release,
    };

    +static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_state *lsp, int new_lock_owner, int error)
    +{
    + struct nfs_client *clp = server->nfs_client;
    + struct nfs4_state *state = lsp->ls_state;
    +
    + switch (error) {
    + case -NFS4ERR_ADMIN_REVOKED:
    + case -NFS4ERR_BAD_STATEID:
    + case -NFS4ERR_EXPIRED:
    + if (new_lock_owner != 0 ||
    + (lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0)
    + nfs4_state_mark_reclaim_nograce(clp, state);
    + lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED;
    + };
    +}
    +
    static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *fl, int reclaim)
    {
    struct nfs4_lockdata *data;
    @@ -4013,6 +4029,9 @@ static int _nfs4_do_setlk(struct nfs4_st
    ret = nfs4_wait_for_completion_rpc_task(task);
    if (ret == 0) {
    ret = data->rpc_status;
    + if (ret)
    + nfs4_handle_setlk_error(data->server, data->lsp,
    + data->arg.new_lock_owner, ret);
    } else
    data->cancelled = 1;
    rpc_put_task(task);



    \
     
     \ /
      Last update: 2010-02-19 18:15    [W:0.019 / U:121.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site