diff options
-rw-r--r-- | fs/nfs/nfs4proc.c | 3 | ||||
-rw-r--r-- | fs/nfs/nfs4xdr.c | 3 | ||||
-rw-r--r-- | include/linux/nfs_xdr.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5ef1022b7e6f..b0ec8ff96eb7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -1960,10 +1960,11 @@ static int _nfs4_proc_readlink(struct inode *inode, struct page *page, | |||
1960 | .pglen = pglen, | 1960 | .pglen = pglen, |
1961 | .pages = &page, | 1961 | .pages = &page, |
1962 | }; | 1962 | }; |
1963 | struct nfs4_readlink_res res; | ||
1963 | struct rpc_message msg = { | 1964 | struct rpc_message msg = { |
1964 | .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READLINK], | 1965 | .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READLINK], |
1965 | .rpc_argp = &args, | 1966 | .rpc_argp = &args, |
1966 | .rpc_resp = NULL, | 1967 | .rpc_resp = &res, |
1967 | }; | 1968 | }; |
1968 | 1969 | ||
1969 | return rpc_call_sync(NFS_CLIENT(inode), &msg, 0); | 1970 | return rpc_call_sync(NFS_CLIENT(inode), &msg, 0); |
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 91305861037a..1e41420916ad 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -4235,7 +4235,8 @@ out: | |||
4235 | /* | 4235 | /* |
4236 | * Decode READLINK response | 4236 | * Decode READLINK response |
4237 | */ | 4237 | */ |
4238 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, void *res) | 4238 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, |
4239 | struct nfs4_readlink_res *res) | ||
4239 | { | 4240 | { |
4240 | struct xdr_stream xdr; | 4241 | struct xdr_stream xdr; |
4241 | struct compound_hdr hdr; | 4242 | struct compound_hdr hdr; |
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index a7b7f2a059cc..f71260aeb803 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -754,6 +754,10 @@ struct nfs4_readlink { | |||
754 | struct nfs4_sequence_args seq_args; | 754 | struct nfs4_sequence_args seq_args; |
755 | }; | 755 | }; |
756 | 756 | ||
757 | struct nfs4_readlink_res { | ||
758 | struct nfs4_sequence_res seq_res; | ||
759 | }; | ||
760 | |||
757 | struct nfs4_rename_arg { | 761 | struct nfs4_rename_arg { |
758 | const struct nfs_fh * old_dir; | 762 | const struct nfs_fh * old_dir; |
759 | const struct nfs_fh * new_dir; | 763 | const struct nfs_fh * new_dir; |