aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4xdr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r--fs/nfs/nfs4xdr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index db2bcf722f91..2ba9906f2a51 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -964,9 +964,9 @@ static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_con
964{ 964{
965 uint32_t *p; 965 uint32_t *p;
966 966
967 RESERVE_SPACE(8+sizeof(arg->stateid.data)); 967 RESERVE_SPACE(8+sizeof(arg->stateid->data));
968 WRITE32(OP_OPEN_CONFIRM); 968 WRITE32(OP_OPEN_CONFIRM);
969 WRITEMEM(arg->stateid.data, sizeof(arg->stateid.data)); 969 WRITEMEM(arg->stateid->data, sizeof(arg->stateid->data));
970 WRITE32(arg->seqid->sequence->counter); 970 WRITE32(arg->seqid->sequence->counter);
971 971
972 return 0; 972 return 0;
@@ -1535,9 +1535,6 @@ static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, uint32_t *p, struct n
1535 }; 1535 };
1536 int status; 1536 int status;
1537 1537
1538 status = nfs_wait_on_sequence(args->seqid, req->rq_task);
1539 if (status != 0)
1540 goto out;
1541 xdr_init_encode(&xdr, &req->rq_snd_buf, p); 1538 xdr_init_encode(&xdr, &req->rq_snd_buf, p);
1542 encode_compound_hdr(&xdr, &hdr); 1539 encode_compound_hdr(&xdr, &hdr);
1543 status = encode_putfh(&xdr, args->fh); 1540 status = encode_putfh(&xdr, args->fh);