Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af185fe authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4.1: Reinitialise sequence results before retransmitting a request 



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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ecab6ab1

fs/nfs/nfs4proc.c

+8 −4
Original line number Diff line number Diff line
@@ -947,6 +947,13 @@ nfs4_sequence_process_interrupted(struct nfs_client *client, 


#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 nfs4_sequence_args *args, 
	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_client *client, 


	trace_nfs4_setup_sequence(session, args);

out_start:

	nfs41_sequence_res_init(res);

	rpc_call_start(task);

	return 0;