aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-05-27 09:30:39 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-05-31 12:43:59 -0400
commit68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7 (patch)
tree8f4f795edea5ef4071a06a3fd8de382d376a24f3 /fs/nfsd
parent24a0111e405abeb74701ce3b7b665365c27de19e (diff)
downloadkernel_samsung_smdk4412-68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7.zip
kernel_samsung_smdk4412-68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7.tar.gz
kernel_samsung_smdk4412-68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7.tar.bz2
nfsd4: don't bother storing callback reply tag
We don't use this, and probably never will. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4callback.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index ae91792..c8dd03c 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -143,8 +143,6 @@ struct nfs4_cb_compound_hdr {
u32 minorversion;
/* res */
int status;
- u32 taglen;
- char *tag;
};
static struct {
@@ -293,13 +291,14 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
static int
decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){
__be32 *p;
+ u32 taglen;
READ_BUF(8);
READ32(hdr->status);
- READ32(hdr->taglen);
- READ_BUF(hdr->taglen + 4);
- hdr->tag = (char *)p;
- p += XDR_QUADLEN(hdr->taglen);
+ /* We've got no use for the tag; ignore it: */
+ READ32(taglen);
+ READ_BUF(taglen + 4);
+ p += XDR_QUADLEN(taglen);
READ32(hdr->nops);
return 0;
}