hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2016-11-17 15:15:55 -05:00 committed by Trond Myklebust
parent ced85a7568
commit 7d38de3ffa
8 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/client.c
View File

@ -369,9 +369,7 @@ nfs_found_client(const struct nfs_client_initdata *cl_init,
* Look up a client by IP address and protocol version * Look up a client by IP address and protocol version
* - creates a new record if one doesn't yet exist * - creates a new record if one doesn't yet exist
*/ */
struct nfs_client * struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)
nfs_get_client(const struct nfs_client_initdata *cl_init,
rpc_authflavor_t authflavour)
{ {
struct nfs_client *clp, *new = NULL; struct nfs_client *clp, *new = NULL;
struct nfs_net *nn = net_generic(cl_init->net, nfs_net_id); 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); set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
/* Allocate or find a client reference we can use */ /* 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)) { if (IS_ERR(clp)) {
dprintk("<-- nfs_init_server() = error %ld\n", PTR_ERR(clp)); dprintk("<-- nfs_init_server() = error %ld\n", PTR_ERR(clp));
return PTR_ERR(clp); return PTR_ERR(clp);

3
fs/nfs/filelayout/filelayoutdev.c
View File

@ -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, nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,
dataserver_retrans, 4, dataserver_retrans, 4,
s->nfs_client->cl_minorversion, s->nfs_client->cl_minorversion);
s->nfs_client->cl_rpcclient->cl_auth->au_flavor);
out_test_devid: out_test_devid:
if (filelayout_test_devid_unavailable(devid)) if (filelayout_test_devid_unavailable(devid))

3
fs/nfs/flexfilelayout/flexfilelayoutdev.c
View File

@ -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, nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,
dataserver_retrans, dataserver_retrans,
mirror->mirror_ds->ds_versions[0].version, mirror->mirror_ds->ds_versions[0].version,
mirror->mirror_ds->ds_versions[0].minor_version, mirror->mirror_ds->ds_versions[0].minor_version);
RPC_AUTH_UNIX);
/* connect success, check rsize/wsize limit */ /* connect success, check rsize/wsize limit */
if (ds->ds_clp) { if (ds->ds_clp) {

8
fs/nfs/internal.h
View File

@ -154,8 +154,7 @@ extern const struct rpc_program nfs_program;
extern void nfs_clients_init(struct net *net); extern void nfs_clients_init(struct net *net);
extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *); 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); 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 *, struct nfs_client *nfs_get_client(const struct nfs_client_initdata *);
rpc_authflavor_t);
int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *, struct nfs_fattr *); 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_insert_lists(struct nfs_server *);
void nfs_server_remove_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, int ds_addrlen, int ds_proto,
unsigned int ds_timeo, unsigned int ds_timeo,
unsigned int ds_retrans, unsigned int ds_retrans,
u32 minor_version, u32 minor_version);
rpc_authflavor_t au_flavor);
extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,
struct inode *); struct inode *);
extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,
const struct sockaddr *ds_addr, int ds_addrlen, const struct sockaddr *ds_addr, int ds_addrlen,
int ds_proto, unsigned int ds_timeo, int ds_proto, unsigned int ds_timeo,
unsigned int ds_retrans, rpc_authflavor_t au_flavor); unsigned int ds_retrans);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern int __init nfs_fs_proc_init(void); extern int __init nfs_fs_proc_init(void);
extern void nfs_fs_proc_exit(void); extern void nfs_fs_proc_exit(void);

5
fs/nfs/nfs3client.c
View File

@ -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, struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,
const struct sockaddr *ds_addr, int ds_addrlen, const struct sockaddr *ds_addr, int ds_addrlen,
int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)
rpc_authflavor_t au_flavor)
{ {
struct rpc_timeout ds_timeout; struct rpc_timeout ds_timeout;
struct nfs_client *mds_clp = mds_srv->nfs_client; 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. */ /* Use the MDS nfs_client cl_ipaddr. */
nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); 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; return clp;
} }

10
fs/nfs/nfs4client.c
View File

@ -901,7 +901,6 @@ static int nfs4_set_client(struct nfs_server *server,
const struct sockaddr *addr, const struct sockaddr *addr,
const size_t addrlen, const size_t addrlen,
const char *ip_addr, const char *ip_addr,
rpc_authflavor_t authflavour,
int proto, const struct rpc_timeout *timeparms, int proto, const struct rpc_timeout *timeparms,
u32 minorversion, struct net *net) u32 minorversion, struct net *net)
{ {
@ -927,7 +926,7 @@ static int nfs4_set_client(struct nfs_server *server,
set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
/* Allocate or find a client reference we can use */ /* Allocate or find a client reference we can use */
clp = nfs_get_client(&cl_init, authflavour); clp = nfs_get_client(&cl_init);
if (IS_ERR(clp)) { if (IS_ERR(clp)) {
error = PTR_ERR(clp); error = PTR_ERR(clp);
goto error; goto error;
@ -968,7 +967,7 @@ error:
struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,
const struct sockaddr *ds_addr, int ds_addrlen, const struct sockaddr *ds_addr, int ds_addrlen,
int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans,
u32 minor_version, rpc_authflavor_t au_flavor) u32 minor_version)
{ {
struct rpc_timeout ds_timeout; struct rpc_timeout ds_timeout;
struct nfs_client *mds_clp = mds_srv->nfs_client; struct nfs_client *mds_clp = mds_srv->nfs_client;
@ -999,7 +998,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,
* (section 13.1 RFC 5661). * (section 13.1 RFC 5661).
*/ */
nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); 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);
dprintk("<-- %s %p\n", __func__, clp); dprintk("<-- %s %p\n", __func__, clp);
return clp; return clp;
@ -1123,7 +1122,6 @@ static int nfs4_init_server(struct nfs_server *server,
(const struct sockaddr *)&data->nfs_server.address, (const struct sockaddr *)&data->nfs_server.address,
data->nfs_server.addrlen, data->nfs_server.addrlen,
data->client_address, data->client_address,
data->selected_flavor,
data->nfs_server.protocol, data->nfs_server.protocol,
&timeparms, &timeparms,
data->minorversion, data->minorversion,
@ -1220,7 +1218,6 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
data->addr, data->addr,
data->addrlen, data->addrlen,
parent_client->cl_ipaddr, parent_client->cl_ipaddr,
data->authflavor,
rpc_protocol(parent_server->client), rpc_protocol(parent_server->client),
parent_server->client->cl_timeout, parent_server->client->cl_timeout,
parent_client->cl_mvops->minor_version, parent_client->cl_mvops->minor_version,
@ -1331,7 +1328,6 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname,
nfs_server_remove_lists(server); nfs_server_remove_lists(server);
error = nfs4_set_client(server, hostname, sap, salen, buf, error = nfs4_set_client(server, hostname, sap, salen, buf,
clp->cl_rpcclient->cl_auth->au_flavor,
clp->cl_proto, clnt->cl_timeout, clp->cl_proto, clnt->cl_timeout,
clp->cl_minorversion, net); clp->cl_minorversion, net);
nfs_put_client(clp); nfs_put_client(clp);

3
fs/nfs/pnfs.h
View File

@ -369,8 +369,7 @@ struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs,
void nfs4_pnfs_v3_ds_connect_unload(void); void nfs4_pnfs_v3_ds_connect_unload(void);
void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
struct nfs4_deviceid_node *devid, unsigned int timeo, struct nfs4_deviceid_node *devid, unsigned int timeo,
unsigned int retrans, u32 version, u32 minor_version, unsigned int retrans, u32 version, u32 minor_version);
rpc_authflavor_t au_flavor);
struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net,
struct xdr_stream *xdr, struct xdr_stream *xdr,
gfp_t gfp_flags); gfp_t gfp_flags);

28
fs/nfs/pnfs_nfs.c
View File

@ -600,8 +600,7 @@ static struct nfs_client *(*get_v3_ds_connect)(
int ds_addrlen, int ds_addrlen,
int ds_proto, int ds_proto,
unsigned int ds_timeo, unsigned int ds_timeo,
unsigned int ds_retrans, unsigned int ds_retrans);
rpc_authflavor_t au_flavor);
static bool load_v3_ds_connect(void) static bool load_v3_ds_connect(void)
{ {
@ -625,15 +624,13 @@ EXPORT_SYMBOL_GPL(nfs4_pnfs_v3_ds_connect_unload);
static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,
struct nfs4_pnfs_ds *ds, struct nfs4_pnfs_ds *ds,
unsigned int timeo, unsigned int timeo,
unsigned int retrans, unsigned int retrans)
rpc_authflavor_t au_flavor)
{ {
struct nfs_client *clp = ERR_PTR(-EIO); struct nfs_client *clp = ERR_PTR(-EIO);
struct nfs4_pnfs_ds_addr *da; struct nfs4_pnfs_ds_addr *da;
int status = 0; int status = 0;
dprintk("--> %s DS %s au_flavor %d\n", __func__, dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr);
ds->ds_remotestr, au_flavor);
if (!load_v3_ds_connect()) if (!load_v3_ds_connect())
goto out; goto out;
@ -657,7 +654,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,
clp = get_v3_ds_connect(mds_srv, clp = get_v3_ds_connect(mds_srv,
(struct sockaddr *)&da->da_addr, (struct sockaddr *)&da->da_addr,
da->da_addrlen, IPPROTO_TCP, da->da_addrlen, IPPROTO_TCP,
timeo, retrans, au_flavor); timeo, retrans);
} }
if (IS_ERR(clp)) { if (IS_ERR(clp)) {
@ -676,15 +673,13 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,
struct nfs4_pnfs_ds *ds, struct nfs4_pnfs_ds *ds,
unsigned int timeo, unsigned int timeo,
unsigned int retrans, unsigned int retrans,
u32 minor_version, u32 minor_version)
rpc_authflavor_t au_flavor)
{ {
struct nfs_client *clp = ERR_PTR(-EIO); struct nfs_client *clp = ERR_PTR(-EIO);
struct nfs4_pnfs_ds_addr *da; struct nfs4_pnfs_ds_addr *da;
int status = 0; int status = 0;
dprintk("--> %s DS %s au_flavor %d\n", __func__, ds->ds_remotestr, dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr);
au_flavor);
list_for_each_entry(da, &ds->ds_addrs, da_node) { list_for_each_entry(da, &ds->ds_addrs, da_node) {
dprintk("%s: DS %s: trying address %s\n", dprintk("%s: DS %s: trying address %s\n",
@ -720,8 +715,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,
clp = nfs4_set_ds_client(mds_srv, clp = nfs4_set_ds_client(mds_srv,
(struct sockaddr *)&da->da_addr, (struct sockaddr *)&da->da_addr,
da->da_addrlen, IPPROTO_TCP, da->da_addrlen, IPPROTO_TCP,
timeo, retrans, minor_version, timeo, retrans, minor_version);
au_flavor);
if (IS_ERR(clp)) if (IS_ERR(clp))
continue; continue;
@ -755,19 +749,17 @@ out:
*/ */
void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
struct nfs4_deviceid_node *devid, unsigned int timeo, struct nfs4_deviceid_node *devid, unsigned int timeo,
unsigned int retrans, u32 version, unsigned int retrans, u32 version, u32 minor_version)
u32 minor_version, rpc_authflavor_t au_flavor)
{ {
if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) {
int err = 0; int err = 0;
if (version == 3) { if (version == 3) {
err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo, err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo,
retrans, au_flavor); retrans);
} else if (version == 4) { } else if (version == 4) {
err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo, err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo,
retrans, minor_version, retrans, minor_version);
au_flavor);
} else { } else {
dprintk("%s: unsupported DS version %d\n", __func__, dprintk("%s: unsupported DS version %d\n", __func__,
version); version);