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

Commit 7fb64cee authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: seqid comments 



Add some comments on the use of so_seqid, in an attempt to avoid some of the
confusion outlined in the previous patch....

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bd9aac52

fs/nfsd/nfs4xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -1210,10 +1210,10 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
	save = resp->p;



/*

 * Routine for encoding the result of a

 * "seqid-mutating" NFSv4 operation.  This is

 * where seqids are incremented, and the

 * replay cache is filled.

 * Routine for encoding the result of a "seqid-mutating" NFSv4 operation.  This

 * is where sequence id's are incremented, and the replay cache is filled.

 * Note that we increment sequence id's here, at the last moment, so we're sure

 * we know whether the error to be returned is a sequence id mutating error.

 */



#define ENCODE_SEQID_OP_TAIL(stateowner) do {			\

include/linux/nfsd/state.h

+3 −1
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct nfs4_stateowner { 
	int			so_is_open_owner; /* 1=openowner,0=lockowner */

	u32                     so_id;

	struct nfs4_client *    so_client;

	/* after increment in ENCODE_SEQID_OP_TAIL, represents the next

	 * sequence id expected from the client: */

	u32                     so_seqid;

	struct xdr_netobj       so_owner;     /* open owner name */

	int                     so_confirmed; /* successful OPEN_CONFIRM? */