From: J. Bruce Fields <bfields@fieldses.org>
Date: Tue, 17 Jul 2007 11:04:35 +0000 (-0700)
Subject: knfsd: nfsd4: fix NFSv4 filehandle size units confusion
X-Git-Tag: v2.6.23-rc1~660
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33a1060ae7dc671a0208b341bd454009625bb5a6;p=linux-2.6

knfsd: nfsd4: fix NFSv4 filehandle size units confusion

NFS4_FHSIZE is measured in bytes, not 4-byte words, so much more space than
necessary is being allocated for struct nfs4_cb_recall.

I should have wondered why this structure was so much larger than it needed to
be!

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index ab5c236bd9..732de9cad4 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -67,7 +67,7 @@ struct nfs4_cb_recall {
 	int			cbr_trunc;
 	stateid_t		cbr_stateid;
 	u32			cbr_fhlen;
-	u32			cbr_fhval[NFS4_FHSIZE];
+	char			cbr_fhval[NFS4_FHSIZE];
 	struct nfs4_delegation	*cbr_dp;
 };