nfsd4: don't bother storing callback reply tag
authorJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 27 May 2010 13:30:39 +0000 (09:30 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Mon, 31 May 2010 16:43:59 +0000 (12:43 -0400)
We don't use this, and probably never will.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/nfsd/nfs4callback.c

index ae917921ed415953334d23771e46d1b4f0b2b77d..c8dd03c3f0fd657556186f8679b95321e15de9dd 100644 (file)
@@ -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;
 }