[pnfs] [PATCH 4/4] nfs41: get rid of cb_compound_hdr_arg.callback_ident

Benny Halevy bhalevy at panasas.com
Wed Feb 6 13:05:31 EST 2008


From: Benny Halevy <bhalevy at panasas.com>

callback_ident is not used anywhere so we shouldn't waste any memory to
store it.

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/callback.h     |    1 -
 fs/nfs/callback_xdr.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 406fedf..46d0dbc 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -37,7 +37,6 @@ struct cb_compound_hdr_arg {
 	unsigned int taglen;
 	const char *tag;
 	unsigned int minorversion;
-	unsigned int callback_ident;
 	unsigned nops;
 };
 
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 190fce7..009f4a4 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -172,7 +172,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
 		p = read_buf(xdr, 8);
 		if (unlikely(p == NULL))
 			return htonl(NFS4ERR_RESOURCE);
-		hdr->callback_ident = ntohl(*p++);
+		(void)ntohl(*p++);	/* skip callback_ident */
 	} else {
 		printk(KERN_WARNING "%s: NFSv4 server callback with "
 			"illegal minor version %u!\n",
-- 
1.5.3.3



More information about the pNFS mailing list