NSM: Move nsm_create()
Clean up: one last thing... relocate nsm_create() to eliminate the forward declaration and group it near the only function that actually uses it. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
b7ba597fb9
commit
49b5699b3f
@ -44,8 +44,6 @@ struct nsm_res {
|
|||||||
u32 state;
|
u32 state;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct rpc_clnt * nsm_create(void);
|
|
||||||
|
|
||||||
static struct rpc_program nsm_program;
|
static struct rpc_program nsm_program;
|
||||||
static LIST_HEAD(nsm_handles);
|
static LIST_HEAD(nsm_handles);
|
||||||
static DEFINE_SPINLOCK(nsm_lock);
|
static DEFINE_SPINLOCK(nsm_lock);
|
||||||
@ -98,11 +96,26 @@ static void nsm_display_address(const struct sockaddr *sap,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
static struct rpc_clnt *nsm_create(void)
|
||||||
* Common procedure for NSMPROC_MON/NSMPROC_UNMON calls
|
{
|
||||||
*/
|
struct sockaddr_in sin = {
|
||||||
static int
|
.sin_family = AF_INET,
|
||||||
nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
|
.sin_addr.s_addr = htonl(INADDR_LOOPBACK),
|
||||||
|
};
|
||||||
|
struct rpc_create_args args = {
|
||||||
|
.protocol = XPRT_TRANSPORT_UDP,
|
||||||
|
.address = (struct sockaddr *)&sin,
|
||||||
|
.addrsize = sizeof(sin),
|
||||||
|
.servername = "rpc.statd",
|
||||||
|
.program = &nsm_program,
|
||||||
|
.version = NSM_VERSION,
|
||||||
|
.authflavor = RPC_AUTH_NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
return rpc_create(&args);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
|
||||||
{
|
{
|
||||||
struct rpc_clnt *clnt;
|
struct rpc_clnt *clnt;
|
||||||
int status;
|
int status;
|
||||||
@ -408,30 +421,6 @@ void nsm_release(struct nsm_handle *nsm)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Create NSM client for the local host
|
|
||||||
*/
|
|
||||||
static struct rpc_clnt *
|
|
||||||
nsm_create(void)
|
|
||||||
{
|
|
||||||
struct sockaddr_in sin = {
|
|
||||||
.sin_family = AF_INET,
|
|
||||||
.sin_addr.s_addr = htonl(INADDR_LOOPBACK),
|
|
||||||
.sin_port = 0,
|
|
||||||
};
|
|
||||||
struct rpc_create_args args = {
|
|
||||||
.protocol = XPRT_TRANSPORT_UDP,
|
|
||||||
.address = (struct sockaddr *)&sin,
|
|
||||||
.addrsize = sizeof(sin),
|
|
||||||
.servername = "localhost",
|
|
||||||
.program = &nsm_program,
|
|
||||||
.version = NSM_VERSION,
|
|
||||||
.authflavor = RPC_AUTH_NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
return rpc_create(&args);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* XDR functions for NSM.
|
* XDR functions for NSM.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user