Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8407299 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFS Remove unused authflavour parameter from init_client 



Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 73d8bde5

fs/nfs/client.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

fs/nfs/internal.h

+2 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ extern struct rpc_procinfo nfs4_procedures[]; 
void nfs_close_context(struct nfs_open_context *ctx, int is_sync);

extern 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);



/* dir.c */

extern int nfs_access_cache_shrinker(struct shrinker *shrink,
@@ -451,8 +451,7 @@ extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq); 
extern void __nfs4_read_done_cb(struct nfs_read_data *);

extern struct nfs_client *nfs4_init_client(struct nfs_client *clp,

			    const struct rpc_timeout *timeparms,

			    const char *ip_addr,

			    rpc_authflavor_t authflavour);

			    const char *ip_addr);

extern int nfs40_walk_client_list(struct nfs_client *clp,

				struct nfs_client **result,

				struct rpc_cred *cred);

fs/nfs/nfs4client.c

+1 −2
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp) 
 */

struct nfs_client *nfs4_init_client(struct nfs_client *clp,

				    const struct rpc_timeout *timeparms,

				    const char *ip_addr,

				    rpc_authflavor_t authflavour)

				    const char *ip_addr)

{

	char buf[INET6_ADDRSTRLEN + 1];

	struct nfs_client *old;

include/linux/nfs_xdr.h

+1 −1
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ struct nfs_rpc_ops { 
	struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);

	struct nfs_client *

		(*init_client) (struct nfs_client *, const struct rpc_timeout *,

				const char *, rpc_authflavor_t);

				const char *);

	void	(*free_client) (struct nfs_client *);

	struct nfs_server *(*create_server)(struct nfs_mount_info *, struct nfs_subversion *);

	struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,