tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Anna Schumaker and committed by
Trond Myklebust 7d38de3f ced85a75

+23 -43
+2 -4
fs/nfs/client.c
··· 369 369 * Look up a client by IP address and protocol version 370 370 * - creates a new record if one doesn't yet exist 371 371 */ 372 - struct nfs_client * 373 - nfs_get_client(const struct nfs_client_initdata *cl_init, 374 - rpc_authflavor_t authflavour) 372 + struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) 375 373 { 376 374 struct nfs_client *clp, *new = NULL; 377 375 struct nfs_net *nn = net_generic(cl_init->net, nfs_net_id); ··· 653 655 set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); 654 656 655 657 /* Allocate or find a client reference we can use */ 656 - clp = nfs_get_client(&cl_init, RPC_AUTH_UNIX); 658 + clp = nfs_get_client(&cl_init); 657 659 if (IS_ERR(clp)) { 658 660 dprintk("<-- nfs_init_server() = error %ld\n", PTR_ERR(clp)); 659 661 return PTR_ERR(clp);
+1 -2
fs/nfs/filelayout/filelayoutdev.c
··· 279 279 280 280 nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, 281 281 dataserver_retrans, 4, 282 - s->nfs_client->cl_minorversion, 283 - s->nfs_client->cl_rpcclient->cl_auth->au_flavor); 282 + s->nfs_client->cl_minorversion); 284 283 285 284 out_test_devid: 286 285 if (filelayout_test_devid_unavailable(devid))
+1 -2
fs/nfs/flexfilelayout/flexfilelayoutdev.c
··· 384 384 nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, 385 385 dataserver_retrans, 386 386 mirror->mirror_ds->ds_versions[0].version, 387 - mirror->mirror_ds->ds_versions[0].minor_version, 388 - RPC_AUTH_UNIX); 387 + mirror->mirror_ds->ds_versions[0].minor_version); 389 388 390 389 /* connect success, check rsize/wsize limit */ 391 390 if (ds->ds_clp) {
+3 -5
fs/nfs/internal.h
··· 154 154 extern void nfs_clients_init(struct net *net); 155 155 extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *); 156 156 int nfs_create_rpc_client(struct nfs_client *, const struct nfs_client_initdata *, rpc_authflavor_t); 157 - struct nfs_client *nfs_get_client(const struct nfs_client_initdata *, 158 - rpc_authflavor_t); 157 + struct nfs_client *nfs_get_client(const struct nfs_client_initdata *); 159 158 int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *, struct nfs_fattr *); 160 159 void nfs_server_insert_lists(struct nfs_server *); 161 160 void nfs_server_remove_lists(struct nfs_server *); ··· 193 194 int ds_addrlen, int ds_proto, 194 195 unsigned int ds_timeo, 195 196 unsigned int ds_retrans, 196 - u32 minor_version, 197 - rpc_authflavor_t au_flavor); 197 + u32 minor_version); 198 198 extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, 199 199 struct inode *); 200 200 extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, 201 201 const struct sockaddr *ds_addr, int ds_addrlen, 202 202 int ds_proto, unsigned int ds_timeo, 203 - unsigned int ds_retrans, rpc_authflavor_t au_flavor); 203 + unsigned int ds_retrans); 204 204 #ifdef CONFIG_PROC_FS 205 205 extern int __init nfs_fs_proc_init(void); 206 206 extern void nfs_fs_proc_exit(void);
+2 -3
fs/nfs/nfs3client.c
··· 78 78 */ 79 79 struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, 80 80 const struct sockaddr *ds_addr, int ds_addrlen, 81 - int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, 82 - rpc_authflavor_t au_flavor) 81 + int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans) 83 82 { 84 83 struct rpc_timeout ds_timeout; 85 84 struct nfs_client *mds_clp = mds_srv->nfs_client; ··· 105 106 106 107 /* Use the MDS nfs_client cl_ipaddr. */ 107 108 nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); 108 - clp = nfs_get_client(&cl_init, au_flavor); 109 + clp = nfs_get_client(&cl_init); 109 110 110 111 return clp; 111 112 }
+3 -7
fs/nfs/nfs4client.c
··· 901 901 const struct sockaddr *addr, 902 902 const size_t addrlen, 903 903 const char *ip_addr, 904 - rpc_authflavor_t authflavour, 905 904 int proto, const struct rpc_timeout *timeparms, 906 905 u32 minorversion, struct net *net) 907 906 { ··· 926 927 set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); 927 928 928 929 /* Allocate or find a client reference we can use */ 929 - clp = nfs_get_client(&cl_init, authflavour); 930 + clp = nfs_get_client(&cl_init); 930 931 if (IS_ERR(clp)) { 931 932 error = PTR_ERR(clp); 932 933 goto error; ··· 967 968 struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, 968 969 const struct sockaddr *ds_addr, int ds_addrlen, 969 970 int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, 970 - u32 minor_version, rpc_authflavor_t au_flavor) 971 + u32 minor_version) 971 972 { 972 973 struct rpc_timeout ds_timeout; 973 974 struct nfs_client *mds_clp = mds_srv->nfs_client; ··· 998 999 * (section 13.1 RFC 5661). 999 1000 */ 1000 1001 nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); 1001 - clp = nfs_get_client(&cl_init, au_flavor); 1002 + clp = nfs_get_client(&cl_init); 1002 1003 1003 1004 dprintk("<-- %s %p\n", __func__, clp); 1004 1005 return clp; ··· 1122 1123 (const struct sockaddr *)&data->nfs_server.address, 1123 1124 data->nfs_server.addrlen, 1124 1125 data->client_address, 1125 - data->selected_flavor, 1126 1126 data->nfs_server.protocol, 1127 1127 &timeparms, 1128 1128 data->minorversion, ··· 1218 1220 data->addr, 1219 1221 data->addrlen, 1220 1222 parent_client->cl_ipaddr, 1221 - data->authflavor, 1222 1223 rpc_protocol(parent_server->client), 1223 1224 parent_server->client->cl_timeout, 1224 1225 parent_client->cl_mvops->minor_version, ··· 1328 1331 1329 1332 nfs_server_remove_lists(server); 1330 1333 error = nfs4_set_client(server, hostname, sap, salen, buf, 1331 - clp->cl_rpcclient->cl_auth->au_flavor, 1332 1334 clp->cl_proto, clnt->cl_timeout, 1333 1335 clp->cl_minorversion, net); 1334 1336 nfs_put_client(clp);
+1 -2
fs/nfs/pnfs.h
··· 369 369 void nfs4_pnfs_v3_ds_connect_unload(void); 370 370 void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, 371 371 struct nfs4_deviceid_node *devid, unsigned int timeo, 372 - unsigned int retrans, u32 version, u32 minor_version, 373 - rpc_authflavor_t au_flavor); 372 + unsigned int retrans, u32 version, u32 minor_version); 374 373 struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, 375 374 struct xdr_stream *xdr, 376 375 gfp_t gfp_flags);
+10 -18
fs/nfs/pnfs_nfs.c
··· 600 600 int ds_addrlen, 601 601 int ds_proto, 602 602 unsigned int ds_timeo, 603 - unsigned int ds_retrans, 604 - rpc_authflavor_t au_flavor); 603 + unsigned int ds_retrans); 605 604 606 605 static bool load_v3_ds_connect(void) 607 606 { ··· 624 625 static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, 625 626 struct nfs4_pnfs_ds *ds, 626 627 unsigned int timeo, 627 - unsigned int retrans, 628 - rpc_authflavor_t au_flavor) 628 + unsigned int retrans) 629 629 { 630 630 struct nfs_client *clp = ERR_PTR(-EIO); 631 631 struct nfs4_pnfs_ds_addr *da; 632 632 int status = 0; 633 633 634 - dprintk("--> %s DS %s au_flavor %d\n", __func__, 635 - ds->ds_remotestr, au_flavor); 634 + dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr); 636 635 637 636 if (!load_v3_ds_connect()) 638 637 goto out; ··· 654 657 clp = get_v3_ds_connect(mds_srv, 655 658 (struct sockaddr *)&da->da_addr, 656 659 da->da_addrlen, IPPROTO_TCP, 657 - timeo, retrans, au_flavor); 660 + timeo, retrans); 658 661 } 659 662 660 663 if (IS_ERR(clp)) { ··· 673 676 struct nfs4_pnfs_ds *ds, 674 677 unsigned int timeo, 675 678 unsigned int retrans, 676 - u32 minor_version, 677 - rpc_authflavor_t au_flavor) 679 + u32 minor_version) 678 680 { 679 681 struct nfs_client *clp = ERR_PTR(-EIO); 680 682 struct nfs4_pnfs_ds_addr *da; 681 683 int status = 0; 682 684 683 - dprintk("--> %s DS %s au_flavor %d\n", __func__, ds->ds_remotestr, 684 - au_flavor); 685 + dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr); 685 686 686 687 list_for_each_entry(da, &ds->ds_addrs, da_node) { 687 688 dprintk("%s: DS %s: trying address %s\n", ··· 715 720 clp = nfs4_set_ds_client(mds_srv, 716 721 (struct sockaddr *)&da->da_addr, 717 722 da->da_addrlen, IPPROTO_TCP, 718 - timeo, retrans, minor_version, 719 - au_flavor); 723 + timeo, retrans, minor_version); 720 724 if (IS_ERR(clp)) 721 725 continue; 722 726 ··· 749 755 */ 750 756 void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, 751 757 struct nfs4_deviceid_node *devid, unsigned int timeo, 752 - unsigned int retrans, u32 version, 753 - u32 minor_version, rpc_authflavor_t au_flavor) 758 + unsigned int retrans, u32 version, u32 minor_version) 754 759 { 755 760 if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { 756 761 int err = 0; 757 762 758 763 if (version == 3) { 759 764 err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo, 760 - retrans, au_flavor); 765 + retrans); 761 766 } else if (version == 4) { 762 767 err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo, 763 - retrans, minor_version, 764 - au_flavor); 768 + retrans, minor_version); 765 769 } else { 766 770 dprintk("%s: unsupported DS version %d\n", __func__, 767 771 version);