Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / fs / nfs / client.c

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 340b1eff02679ad3485f51f6c526ba3363b2ef53..2dceee4db07652fd449ef713037a8a268d864f00 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -501,8 +501,7 @@ nfs_get_client(const struct nfs_client_initdata *cl_init,
                                        &nn->nfs_client_list);
                        spin_unlock(&nn->nfs_client_lock);
                        new->cl_flags = cl_init->init_flags;
-                       return rpc_ops->init_client(new, timeparms, ip_addr,
-                                                   authflavour);
+                       return rpc_ops->init_client(new, timeparms, ip_addr);
                }
 
                spin_unlock(&nn->nfs_client_lock);
@@ -694,13 +693,12 @@ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
  * @clp: nfs_client to initialise
  * @timeparms: timeout parameters for underlying RPC transport
  * @ip_addr: IP presentation address (not used)
- * @authflavor: authentication flavor for underlying RPC transport
  *
  * Returns pointer to an NFS client, or an ERR_PTR value.
  */
 struct nfs_client *nfs_init_client(struct nfs_client *clp,
                    const struct rpc_timeout *timeparms,
-                   const char *ip_addr, rpc_authflavor_t authflavour)
+                   const char *ip_addr)
 {
        int error;