lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 190/238] NFSv4.1: Reinitialise sequence results before retransmitting a request
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    commit c1dffe0bf7f9c3d57d9f237a7cb2a81e62babd2b upstream.

    If we have to retransmit a request, we should ensure that we reinitialise
    the sequence results structure, since in the event of a signal
    we need to treat the request as if it had not been sent.

    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/nfs4proc.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -947,6 +947,13 @@ nfs4_sequence_process_interrupted(struct

    #endif /* !CONFIG_NFS_V4_1 */

    +static void nfs41_sequence_res_init(struct nfs4_sequence_res *res)
    +{
    + res->sr_timestamp = jiffies;
    + res->sr_status_flags = 0;
    + res->sr_status = 1;
    +}
    +
    static
    void nfs4_sequence_attach_slot(struct nfs4_sequence_args *args,
    struct nfs4_sequence_res *res,
    @@ -958,10 +965,6 @@ void nfs4_sequence_attach_slot(struct nf
    args->sa_slot = slot;

    res->sr_slot = slot;
    - res->sr_timestamp = jiffies;
    - res->sr_status_flags = 0;
    - res->sr_status = 1;
    -
    }

    int nfs4_setup_sequence(struct nfs_client *client,
    @@ -1007,6 +1010,7 @@ int nfs4_setup_sequence(struct nfs_clien

    trace_nfs4_setup_sequence(session, args);
    out_start:
    + nfs41_sequence_res_init(res);
    rpc_call_start(task);
    return 0;


    \
     
     \ /
      Last update: 2019-03-22 13:22    [W:4.152 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site