diff options
Diffstat (limited to 'fs/nfs/nfs2xdr.c')
-rw-r--r-- | fs/nfs/nfs2xdr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index 62db136339ea..5f61b83f4a1c 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c | |||
@@ -103,7 +103,7 @@ static void print_overflow_msg(const char *func, const struct xdr_stream *xdr) | |||
103 | /* | 103 | /* |
104 | * typedef opaque nfsdata<>; | 104 | * typedef opaque nfsdata<>; |
105 | */ | 105 | */ |
106 | static int decode_nfsdata(struct xdr_stream *xdr, struct nfs_readres *result) | 106 | static int decode_nfsdata(struct xdr_stream *xdr, struct nfs_pgio_res *result) |
107 | { | 107 | { |
108 | u32 recvd, count; | 108 | u32 recvd, count; |
109 | __be32 *p; | 109 | __be32 *p; |
@@ -613,7 +613,7 @@ static void nfs2_xdr_enc_readlinkargs(struct rpc_rqst *req, | |||
613 | * }; | 613 | * }; |
614 | */ | 614 | */ |
615 | static void encode_readargs(struct xdr_stream *xdr, | 615 | static void encode_readargs(struct xdr_stream *xdr, |
616 | const struct nfs_readargs *args) | 616 | const struct nfs_pgio_args *args) |
617 | { | 617 | { |
618 | u32 offset = args->offset; | 618 | u32 offset = args->offset; |
619 | u32 count = args->count; | 619 | u32 count = args->count; |
@@ -629,7 +629,7 @@ static void encode_readargs(struct xdr_stream *xdr, | |||
629 | 629 | ||
630 | static void nfs2_xdr_enc_readargs(struct rpc_rqst *req, | 630 | static void nfs2_xdr_enc_readargs(struct rpc_rqst *req, |
631 | struct xdr_stream *xdr, | 631 | struct xdr_stream *xdr, |
632 | const struct nfs_readargs *args) | 632 | const struct nfs_pgio_args *args) |
633 | { | 633 | { |
634 | encode_readargs(xdr, args); | 634 | encode_readargs(xdr, args); |
635 | prepare_reply_buffer(req, args->pages, args->pgbase, | 635 | prepare_reply_buffer(req, args->pages, args->pgbase, |
@@ -649,7 +649,7 @@ static void nfs2_xdr_enc_readargs(struct rpc_rqst *req, | |||
649 | * }; | 649 | * }; |
650 | */ | 650 | */ |
651 | static void encode_writeargs(struct xdr_stream *xdr, | 651 | static void encode_writeargs(struct xdr_stream *xdr, |
652 | const struct nfs_writeargs *args) | 652 | const struct nfs_pgio_args *args) |
653 | { | 653 | { |
654 | u32 offset = args->offset; | 654 | u32 offset = args->offset; |
655 | u32 count = args->count; | 655 | u32 count = args->count; |
@@ -669,7 +669,7 @@ static void encode_writeargs(struct xdr_stream *xdr, | |||
669 | 669 | ||
670 | static void nfs2_xdr_enc_writeargs(struct rpc_rqst *req, | 670 | static void nfs2_xdr_enc_writeargs(struct rpc_rqst *req, |
671 | struct xdr_stream *xdr, | 671 | struct xdr_stream *xdr, |
672 | const struct nfs_writeargs *args) | 672 | const struct nfs_pgio_args *args) |
673 | { | 673 | { |
674 | encode_writeargs(xdr, args); | 674 | encode_writeargs(xdr, args); |
675 | xdr->buf->flags |= XDRBUF_WRITE; | 675 | xdr->buf->flags |= XDRBUF_WRITE; |
@@ -857,7 +857,7 @@ out_default: | |||
857 | * }; | 857 | * }; |
858 | */ | 858 | */ |
859 | static int nfs2_xdr_dec_readres(struct rpc_rqst *req, struct xdr_stream *xdr, | 859 | static int nfs2_xdr_dec_readres(struct rpc_rqst *req, struct xdr_stream *xdr, |
860 | struct nfs_readres *result) | 860 | struct nfs_pgio_res *result) |
861 | { | 861 | { |
862 | enum nfs_stat status; | 862 | enum nfs_stat status; |
863 | int error; | 863 | int error; |
@@ -878,7 +878,7 @@ out_default: | |||
878 | } | 878 | } |
879 | 879 | ||
880 | static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, struct xdr_stream *xdr, | 880 | static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, struct xdr_stream *xdr, |
881 | struct nfs_writeres *result) | 881 | struct nfs_pgio_res *result) |
882 | { | 882 | { |
883 | /* All NFSv2 writes are "file sync" writes */ | 883 | /* All NFSv2 writes are "file sync" writes */ |
884 | result->verf->committed = NFS_FILE_SYNC; | 884 | result->verf->committed = NFS_FILE_SYNC; |