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

Commit 7d38de3f authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove unused authflavour parameter from nfs_get_client() 



This parameter hasn't been used since f8407299 (Linux 3.11-rc2), so
let's remove it from this function and callers.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ced85a75

fs/nfs/client.c

+2 −4
Original line number Diff line number Diff line
@@ -369,9 +369,7 @@ nfs_found_client(const struct nfs_client_initdata *cl_init, 
 * Look up a client by IP address and protocol version

 * - creates a new record if one doesn't yet exist

 */

struct nfs_client *

nfs_get_client(const struct nfs_client_initdata *cl_init,

	       rpc_authflavor_t authflavour)

struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)

{

	struct nfs_client *clp, *new = NULL;

	struct nfs_net *nn = net_generic(cl_init->net, nfs_net_id);
@@ -655,7 +653,7 @@ static int nfs_init_server(struct nfs_server *server, 
		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);



	/* Allocate or find a client reference we can use */

	clp = nfs_get_client(&cl_init, RPC_AUTH_UNIX);

	clp = nfs_get_client(&cl_init);

	if (IS_ERR(clp)) {

		dprintk("<-- nfs_init_server() = error %ld\n", PTR_ERR(clp));

		return PTR_ERR(clp);

fs/nfs/filelayout/filelayoutdev.c

+1 −2
Original line number Diff line number Diff line
@@ -279,8 +279,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 


	nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

			     dataserver_retrans, 4,

			     s->nfs_client->cl_minorversion,

			     s->nfs_client->cl_rpcclient->cl_auth->au_flavor);

			     s->nfs_client->cl_minorversion);



out_test_devid:

	if (filelayout_test_devid_unavailable(devid))

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −2
Original line number Diff line number Diff line
@@ -384,8 +384,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
	nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

			     dataserver_retrans,

			     mirror->mirror_ds->ds_versions[0].version,

			     mirror->mirror_ds->ds_versions[0].minor_version,

			     RPC_AUTH_UNIX);

			     mirror->mirror_ds->ds_versions[0].minor_version);



	/* connect success, check rsize/wsize limit */

	if (ds->ds_clp) {

fs/nfs/internal.h

+3 −5
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ extern const struct rpc_program nfs_program; 
extern void nfs_clients_init(struct net *net);

extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *);

int nfs_create_rpc_client(struct nfs_client *, const struct nfs_client_initdata *, rpc_authflavor_t);

struct nfs_client *nfs_get_client(const struct nfs_client_initdata *,

				  rpc_authflavor_t);

struct nfs_client *nfs_get_client(const struct nfs_client_initdata *);

int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *, struct nfs_fattr *);

void nfs_server_insert_lists(struct nfs_server *);

void nfs_server_remove_lists(struct nfs_server *);
@@ -194,14 +193,13 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, 
					     int ds_addrlen, int ds_proto,

					     unsigned int ds_timeo,

					     unsigned int ds_retrans,

					     u32 minor_version,

					     rpc_authflavor_t au_flavor);

					     u32 minor_version);

extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,

						struct inode *);

extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,

			const struct sockaddr *ds_addr, int ds_addrlen,

			int ds_proto, unsigned int ds_timeo,

			unsigned int ds_retrans, rpc_authflavor_t au_flavor);

			unsigned int ds_retrans);

#ifdef CONFIG_PROC_FS

extern int __init nfs_fs_proc_init(void);

extern void nfs_fs_proc_exit(void);

fs/nfs/nfs3client.c

+2 −3
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ struct nfs_server *nfs3_clone_server(struct nfs_server *source, 
 */

struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,

		const struct sockaddr *ds_addr, int ds_addrlen,

		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans,

		rpc_authflavor_t au_flavor)

		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)

{

	struct rpc_timeout ds_timeout;

	struct nfs_client *mds_clp = mds_srv->nfs_client;
@@ -106,7 +105,7 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, 


	/* Use the MDS nfs_client cl_ipaddr. */

	nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);

	clp = nfs_get_client(&cl_init, au_flavor);

	clp = nfs_get_client(&cl_init);



	return clp;

}