aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs_nfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/pnfs_nfs.c')
-rw-r--r--fs/nfs/pnfs_nfs.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index 106ee08ef52f..ad211a4e1874 100644
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -554,6 +554,7 @@ static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv,
554 struct nfs4_pnfs_ds *ds, 554 struct nfs4_pnfs_ds *ds,
555 unsigned int timeo, 555 unsigned int timeo,
556 unsigned int retrans, 556 unsigned int retrans,
557 u32 minor_version,
557 rpc_authflavor_t au_flavor) 558 rpc_authflavor_t au_flavor)
558{ 559{
559 struct nfs_client *clp = ERR_PTR(-EIO); 560 struct nfs_client *clp = ERR_PTR(-EIO);
@@ -570,7 +571,8 @@ static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv,
570 clp = nfs4_set_ds_client(mds_srv->nfs_client, 571 clp = nfs4_set_ds_client(mds_srv->nfs_client,
571 (struct sockaddr *)&da->da_addr, 572 (struct sockaddr *)&da->da_addr,
572 da->da_addrlen, IPPROTO_TCP, 573 da->da_addrlen, IPPROTO_TCP,
573 timeo, retrans, au_flavor); 574 timeo, retrans, minor_version,
575 au_flavor);
574 if (!IS_ERR(clp)) 576 if (!IS_ERR(clp))
575 break; 577 break;
576 } 578 }
@@ -601,13 +603,14 @@ out_put:
601 */ 603 */
602void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, 604void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
603 struct nfs4_deviceid_node *devid, unsigned int timeo, 605 struct nfs4_deviceid_node *devid, unsigned int timeo,
604 unsigned int retrans, rpc_authflavor_t au_flavor) 606 unsigned int retrans, u32 version,
607 u32 minor_version, rpc_authflavor_t au_flavor)
605{ 608{
606 if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { 609 if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) {
607 int err = 0; 610 int err = 0;
608 611
609 err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo, 612 err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo, retrans,
610 retrans, au_flavor); 613 minor_version, au_flavor);
611 if (err) 614 if (err)
612 nfs4_mark_deviceid_unavailable(devid); 615 nfs4_mark_deviceid_unavailable(devid);
613 nfs4_clear_ds_conn_bit(ds); 616 nfs4_clear_ds_conn_bit(ds);