aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2011-06-02 15:07:35 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-06-21 11:54:07 -0400
commit1650add23578b5ca35c1f1e863987180a8c03779 (patch)
tree886647bf9928ff27f25d0de82c356c1f238738c3 /fs/nfs
parent19982ba8562e33083cb5bbb59a74855d8a9624ea (diff)
downloadkernel_samsung_smdk4412-1650add23578b5ca35c1f1e863987180a8c03779.zip
kernel_samsung_smdk4412-1650add23578b5ca35c1f1e863987180a8c03779.tar.gz
kernel_samsung_smdk4412-1650add23578b5ca35c1f1e863987180a8c03779.tar.bz2
NFS: Fix decode_secinfo_maxsz
I initially did the calculation in bytes, and not words Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 5db44a8..6870bc6 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -255,7 +255,7 @@ static int nfs4_stat_to_errno(int);
#define decode_fs_locations_maxsz \
(0)
#define encode_secinfo_maxsz (op_encode_hdr_maxsz + nfs4_name_maxsz)
-#define decode_secinfo_maxsz (op_decode_hdr_maxsz + 4 + (NFS_MAX_SECFLAVORS * (16 + GSS_OID_MAX_LEN)))
+#define decode_secinfo_maxsz (op_decode_hdr_maxsz + 1 + ((NFS_MAX_SECFLAVORS * (16 + GSS_OID_MAX_LEN)) / 4))
#if defined(CONFIG_NFS_V4_1)
#define NFS4_MAX_MACHINE_NAME_LEN (64)