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)
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 ae917921ed41..c8dd03c3f0fd 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -143,8 +143,6 @@ struct nfs4_cb_compound_hdr {
143 u32 minorversion; 143 u32 minorversion;
144 /* res */ 144 /* res */
145 int status; 145 int status;
146 u32 taglen;
147 char *tag;
148}; 146};
149 147
150static struct { 148static struct {
@@ -293,13 +291,14 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
293static int 291static int
294decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ 292decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){
295 __be32 *p; 293 __be32 *p;
294 u32 taglen;
296 295
297 READ_BUF(8); 296 READ_BUF(8);
298 READ32(hdr->status); 297 READ32(hdr->status);
299 READ32(hdr->taglen); 298 /* We've got no use for the tag; ignore it: */
300 READ_BUF(hdr->taglen + 4); 299 READ32(taglen);
301 hdr->tag = (char *)p; 300 READ_BUF(taglen + 4);
302 p += XDR_QUADLEN(hdr->taglen); 301 p += XDR_QUADLEN(taglen);
303 READ32(hdr->nops); 302 READ32(hdr->nops);
304 return 0; 303 return 0;
305} 304}