NLM: Introduce an arguments structure for nlmclnt_init()
Clean up: pass 5 arguments to nlmclnt_init() in a structure similar to the
new nfs_client_initdata structure.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 0b3ce86..7a15832 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -468,18 +468,21 @@
{
struct nlm_host *host;
struct nfs_client *clp = server->nfs_client;
- u32 nfs_version = clp->rpc_ops->version;
- unsigned short protocol = server->flags & NFS_MOUNT_TCP ?
- IPPROTO_TCP : IPPROTO_UDP;
+ struct nlmclnt_initdata nlm_init = {
+ .hostname = clp->cl_hostname,
+ .address = (struct sockaddr *)&clp->cl_addr,
+ .addrlen = clp->cl_addrlen,
+ .protocol = server->flags & NFS_MOUNT_TCP ?
+ IPPROTO_TCP : IPPROTO_UDP,
+ .nfs_version = clp->rpc_ops->version,
+ };
- if (nfs_version > 3)
+ if (nlm_init.nfs_version > 3)
return 0;
if (server->flags & NFS_MOUNT_NONLM)
return 0;
- host = nlmclnt_init(clp->cl_hostname,
- (struct sockaddr *)&clp->cl_addr,
- clp->cl_addrlen, protocol, nfs_version);
+ host = nlmclnt_init(&nlm_init);
if (IS_ERR(host))
return PTR_ERR(host);
