NFSv4: The stateid must remain the same for replayed RPC calls

If we replay a READ or WRITE call, we should not be changing the
stateid. Currently, we may end up doing so, because the stateid
is only selected at xdr encode time.

This patch ensures that we select the stateid after we get an NFSv4.1
session slot, and that we keep that same stateid across retries.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 2 insertions, 26 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index e3edda554ac7..9d328777b4c1 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1506,35 +1506,12 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
         encode_op_hdr(xdr, OP_PUTROOTFH, decode_putrootfh_maxsz, hdr);
 }
 
-static void encode_open_stateid(struct xdr_stream *xdr,
-                const struct nfs_open_context *ctx,
-                const struct nfs_lock_context *l_ctx,
-                fmode_t fmode,
-                int zero_seqid)
-{
-        nfs4_stateid stateid;
-
-        if (ctx->state != NULL) {
-                const struct nfs_lockowner *lockowner = NULL;
-
-                if (l_ctx != NULL)
-                        lockowner = &l_ctx->lockowner;
-                nfs4_select_rw_stateid(&stateid, ctx->state,
-                                fmode, lockowner);
-                if (zero_seqid)
-                        stateid.seqid = 0;
-                encode_nfs4_stateid(xdr, &stateid);
-        } else
-                encode_nfs4_stateid(xdr, &zero_stateid);
-}
-
 static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args, struct compound_hdr *hdr)
 {
         __be32 *p;
 
         encode_op_hdr(xdr, OP_READ, decode_read_maxsz, hdr);
-        encode_open_stateid(xdr, args->context, args->lock_context,
-                        FMODE_READ, hdr->minorversion);
+        encode_nfs4_stateid(xdr, &args->stateid);
 
         p = reserve_space(xdr, 12);
         p = xdr_encode_hyper(p, args->offset);
@@ -1670,8 +1647,7 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg
         __be32 *p;
 
         encode_op_hdr(xdr, OP_WRITE, decode_write_maxsz, hdr);
-        encode_open_stateid(xdr, args->context, args->lock_context,
-                        FMODE_WRITE, hdr->minorversion);
+        encode_nfs4_stateid(xdr, &args->stateid);
 
         p = reserve_space(xdr, 16);
         p = xdr_encode_hyper(p, args->offset);