diff options
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 73ce8d4fe2c8..939ae606cfa4 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -1556,7 +1556,8 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
1556 | encode_op_hdr(xdr, OP_PUTROOTFH, decode_putrootfh_maxsz, hdr); | 1556 | encode_op_hdr(xdr, OP_PUTROOTFH, decode_putrootfh_maxsz, hdr); |
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args, struct compound_hdr *hdr) | 1559 | static void encode_read(struct xdr_stream *xdr, const struct nfs_pgio_args *args, |
1560 | struct compound_hdr *hdr) | ||
1560 | { | 1561 | { |
1561 | __be32 *p; | 1562 | __be32 *p; |
1562 | 1563 | ||
@@ -1701,7 +1702,8 @@ static void encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs4 | |||
1701 | encode_nfs4_verifier(xdr, &arg->confirm); | 1702 | encode_nfs4_verifier(xdr, &arg->confirm); |
1702 | } | 1703 | } |
1703 | 1704 | ||
1704 | static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr) | 1705 | static void encode_write(struct xdr_stream *xdr, const struct nfs_pgio_args *args, |
1706 | struct compound_hdr *hdr) | ||
1705 | { | 1707 | { |
1706 | __be32 *p; | 1708 | __be32 *p; |
1707 | 1709 | ||
@@ -2451,7 +2453,7 @@ static void nfs4_xdr_enc_readdir(struct rpc_rqst *req, struct xdr_stream *xdr, | |||
2451 | * Encode a READ request | 2453 | * Encode a READ request |
2452 | */ | 2454 | */ |
2453 | static void nfs4_xdr_enc_read(struct rpc_rqst *req, struct xdr_stream *xdr, | 2455 | static void nfs4_xdr_enc_read(struct rpc_rqst *req, struct xdr_stream *xdr, |
2454 | struct nfs_readargs *args) | 2456 | struct nfs_pgio_args *args) |
2455 | { | 2457 | { |
2456 | struct compound_hdr hdr = { | 2458 | struct compound_hdr hdr = { |
2457 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), | 2459 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), |
@@ -2513,7 +2515,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr, | |||
2513 | * Encode a WRITE request | 2515 | * Encode a WRITE request |
2514 | */ | 2516 | */ |
2515 | static void nfs4_xdr_enc_write(struct rpc_rqst *req, struct xdr_stream *xdr, | 2517 | static void nfs4_xdr_enc_write(struct rpc_rqst *req, struct xdr_stream *xdr, |
2516 | struct nfs_writeargs *args) | 2518 | struct nfs_pgio_args *args) |
2517 | { | 2519 | { |
2518 | struct compound_hdr hdr = { | 2520 | struct compound_hdr hdr = { |
2519 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), | 2521 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), |
@@ -5085,7 +5087,8 @@ static int decode_putrootfh(struct xdr_stream *xdr) | |||
5085 | return decode_op_hdr(xdr, OP_PUTROOTFH); | 5087 | return decode_op_hdr(xdr, OP_PUTROOTFH); |
5086 | } | 5088 | } |
5087 | 5089 | ||
5088 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs_readres *res) | 5090 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, |
5091 | struct nfs_pgio_res *res) | ||
5089 | { | 5092 | { |
5090 | __be32 *p; | 5093 | __be32 *p; |
5091 | uint32_t count, eof, recvd; | 5094 | uint32_t count, eof, recvd; |
@@ -5339,7 +5342,7 @@ static int decode_setclientid_confirm(struct xdr_stream *xdr) | |||
5339 | return decode_op_hdr(xdr, OP_SETCLIENTID_CONFIRM); | 5342 | return decode_op_hdr(xdr, OP_SETCLIENTID_CONFIRM); |
5340 | } | 5343 | } |
5341 | 5344 | ||
5342 | static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res) | 5345 | static int decode_write(struct xdr_stream *xdr, struct nfs_pgio_res *res) |
5343 | { | 5346 | { |
5344 | __be32 *p; | 5347 | __be32 *p; |
5345 | int status; | 5348 | int status; |
@@ -6636,7 +6639,7 @@ out: | |||
6636 | * Decode Read response | 6639 | * Decode Read response |
6637 | */ | 6640 | */ |
6638 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, struct xdr_stream *xdr, | 6641 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, struct xdr_stream *xdr, |
6639 | struct nfs_readres *res) | 6642 | struct nfs_pgio_res *res) |
6640 | { | 6643 | { |
6641 | struct compound_hdr hdr; | 6644 | struct compound_hdr hdr; |
6642 | int status; | 6645 | int status; |
@@ -6661,7 +6664,7 @@ out: | |||
6661 | * Decode WRITE response | 6664 | * Decode WRITE response |
6662 | */ | 6665 | */ |
6663 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, struct xdr_stream *xdr, | 6666 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, struct xdr_stream *xdr, |
6664 | struct nfs_writeres *res) | 6667 | struct nfs_pgio_res *res) |
6665 | { | 6668 | { |
6666 | struct compound_hdr hdr; | 6669 | struct compound_hdr hdr; |
6667 | int status; | 6670 | int status; |