summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2011-04-13 14:31:29 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-13 15:12:22 -0400
commit0fabee243a2c6edd66284a4d8948ccbe6727e3bb (patch)
treedc1903c78445c9367816a2765d923b8d7da41e3b
parentd1a8016a2d1e75021ecc8715e3c81442d7218eb6 (diff)
downloadop-kernel-dev-0fabee243a2c6edd66284a4d8948ccbe6727e3bb.zip
op-kernel-dev-0fabee243a2c6edd66284a4d8948ccbe6727e3bb.tar.gz
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>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8a03ee0..8833472 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]);
OpenPOWER on IntegriCloud