| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
|---|
| 1 | 2 | #include <linux/nfs_fs.h> |
|---|
| 2 | 3 | #include <linux/nfs_mount.h> |
|---|
| 3 | 4 | #include <linux/sunrpc/addr.h> |
|---|
| .. | .. |
|---|
| 45 | 46 | } |
|---|
| 46 | 47 | #endif |
|---|
| 47 | 48 | |
|---|
| 48 | | -struct nfs_server *nfs3_create_server(struct nfs_mount_info *mount_info, |
|---|
| 49 | | - struct nfs_subversion *nfs_mod) |
|---|
| 49 | +struct nfs_server *nfs3_create_server(struct fs_context *fc) |
|---|
| 50 | 50 | { |
|---|
| 51 | | - struct nfs_server *server = nfs_create_server(mount_info, nfs_mod); |
|---|
| 51 | + struct nfs_server *server = nfs_create_server(fc); |
|---|
| 52 | + |
|---|
| 52 | 53 | /* Create a client RPC handle for the NFS v3 ACL management interface */ |
|---|
| 53 | 54 | if (!IS_ERR(server)) |
|---|
| 54 | 55 | nfs_init_server_aclclient(server); |
|---|
| .. | .. |
|---|
| 91 | 92 | .proto = ds_proto, |
|---|
| 92 | 93 | .net = mds_clp->cl_net, |
|---|
| 93 | 94 | .timeparms = &ds_timeout, |
|---|
| 95 | + .cred = mds_srv->cred, |
|---|
| 94 | 96 | }; |
|---|
| 95 | 97 | struct nfs_client *clp; |
|---|
| 96 | 98 | char buf[INET6_ADDRSTRLEN + 1]; |
|---|
| .. | .. |
|---|
| 100 | 102 | return ERR_PTR(-EINVAL); |
|---|
| 101 | 103 | cl_init.hostname = buf; |
|---|
| 102 | 104 | |
|---|
| 105 | + if (mds_clp->cl_nconnect > 1 && ds_proto == XPRT_TRANSPORT_TCP) |
|---|
| 106 | + cl_init.nconnect = mds_clp->cl_nconnect; |
|---|
| 107 | + |
|---|
| 103 | 108 | if (mds_srv->flags & NFS_MOUNT_NORESVPORT) |
|---|
| 104 | | - set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); |
|---|
| 109 | + __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); |
|---|
| 110 | + |
|---|
| 111 | + __set_bit(NFS_CS_DS, &cl_init.init_flags); |
|---|
| 105 | 112 | |
|---|
| 106 | 113 | /* Use the MDS nfs_client cl_ipaddr. */ |
|---|
| 107 | 114 | nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); |
|---|