From: Bryan Schumaker <bjschuma@netapp.com>
Date: Wed, 13 Apr 2011 18:31:29 +0000 (-0400)
Subject: NFS: flav_array honors NFS_MAX_SECFLAVORS
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0fabee243a2c6edd66284a4d8948ccbe6727e3bb;p=linux-beck.git

NFS: flav_array honors NFS_MAX_SECFLAVORS

NFS_MAX_SECFLAVORS should already take into account RPC_AUTH_UNIX
and RPC_AUTH_NULL, so we don't need to set aside extra slots
for them.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8a03ee0689f3..8833472c09a9 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2215,7 +2215,7 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
 			      struct nfs_fsinfo *info)
 {
 	int i, len, status = 0;
-	rpc_authflavor_t flav_array[NFS_MAX_SECFLAVORS + 2];
+	rpc_authflavor_t flav_array[NFS_MAX_SECFLAVORS];
 
 	flav_array[0] = RPC_AUTH_UNIX;
 	len = gss_mech_list_pseudoflavors(&flav_array[1]);