mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

SUNRPC: Rename rpcb_getport to be consistent with new rpcb_getport_sync name

Browse source 
Clean up, for consistency.  Rename rpcb_getport as rpcb_getport_async, to
match the naming scheme of rpcb_getport_sync.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-07-01 12:13:17 -04:00 committed by Trond Myklebust
parent cce63cd637
commit 45160d6275
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/sunrpc/clnt.h
View file

@ -122,8 +122,8 @@ void rpc_shutdown_client(struct rpc_clnt *);
void rpc_release_client(struct rpc_clnt *); void rpc_release_client(struct rpc_clnt *);
int rpcb_register(u32, u32, int, unsigned short, int *); int rpcb_register(u32, u32, int, unsigned short, int *);
void rpcb_getport(struct rpc_task *);
int rpcb_getport_sync(struct sockaddr_in *, __u32, __u32, int); int rpcb_getport_sync(struct sockaddr_in *, __u32, __u32, int);
void rpcb_getport_async(struct rpc_task *);
void rpc_call_setup(struct rpc_task *, struct rpc_message *, int); void rpc_call_setup(struct rpc_task *, struct rpc_message *, int);

37
net/sunrpc/rpcb_clnt.c
View file

@ -300,13 +300,13 @@ int rpcb_getport_sync(struct sockaddr_in *sin, __u32 prog,
EXPORT_SYMBOL_GPL(rpcb_getport_sync); EXPORT_SYMBOL_GPL(rpcb_getport_sync);
/** /**
* rpcb_getport - obtain the port for a given RPC service on a given host * rpcb_getport_async - obtain the port for a given RPC service on a given host
* @task: task that is waiting for portmapper request * @task: task that is waiting for portmapper request
* *
* This one can be called for an ongoing RPC request, and can be used in * This one can be called for an ongoing RPC request, and can be used in
* an async (rpciod) context. * an async (rpciod) context.
*/ */
void rpcb_getport(struct rpc_task *task) void rpcb_getport_async(struct rpc_task *task)
{ {
struct rpc_clnt *clnt = task->tk_client; struct rpc_clnt *clnt = task->tk_client;
int bind_version; int bind_version;
@ -317,17 +317,17 @@ void rpcb_getport(struct rpc_task *task)
struct sockaddr addr; struct sockaddr addr;
int status; int status;
dprintk("RPC: %5u rpcb_getport(%s, %u, %u, %d)\n", dprintk("RPC: %5u %s(%s, %u, %u, %d)\n",
task->tk_pid, clnt->cl_server, task->tk_pid, __FUNCTION__,
clnt->cl_prog, clnt->cl_vers, xprt->prot); clnt->cl_server, clnt->cl_prog, clnt->cl_vers, xprt->prot);
/* Autobind on cloned rpc clients is discouraged */ /* Autobind on cloned rpc clients is discouraged */
BUG_ON(clnt->cl_parent != clnt); BUG_ON(clnt->cl_parent != clnt);
if (xprt_test_and_set_binding(xprt)) { if (xprt_test_and_set_binding(xprt)) {
status = -EACCES; /* tell caller to check again */ status = -EACCES; /* tell caller to check again */
dprintk("RPC: %5u rpcb_getport waiting for another binder\n", dprintk("RPC: %5u %s: waiting for another binder\n",
task->tk_pid); task->tk_pid, __FUNCTION__);
goto bailout_nowake; goto bailout_nowake;
} }
@ -338,27 +338,28 @@ void rpcb_getport(struct rpc_task *task)
/* Someone else may have bound if we slept */ /* Someone else may have bound if we slept */
if (xprt_bound(xprt)) { if (xprt_bound(xprt)) {
status = 0; status = 0;
dprintk("RPC: %5u rpcb_getport already bound\n", task->tk_pid); dprintk("RPC: %5u %s: already bound\n",
task->tk_pid, __FUNCTION__);
goto bailout_nofree; goto bailout_nofree;
} }
if (rpcb_next_version[xprt->bind_index].rpc_proc == NULL) { if (rpcb_next_version[xprt->bind_index].rpc_proc == NULL) {
xprt->bind_index = 0; xprt->bind_index = 0;
status = -EACCES; /* tell caller to try again later */ status = -EACCES; /* tell caller to try again later */
dprintk("RPC: %5u rpcb_getport no more getport versions " dprintk("RPC: %5u %s: no more getport versions available\n",
"available\n", task->tk_pid); task->tk_pid, __FUNCTION__);
goto bailout_nofree; goto bailout_nofree;
} }
bind_version = rpcb_next_version[xprt->bind_index].rpc_vers; bind_version = rpcb_next_version[xprt->bind_index].rpc_vers;
dprintk("RPC: %5u rpcb_getport trying rpcbind version %u\n", dprintk("RPC: %5u %s: trying rpcbind version %u\n",
task->tk_pid, bind_version); task->tk_pid, __FUNCTION__, bind_version);
map = kzalloc(sizeof(struct rpcbind_args), GFP_ATOMIC); map = kzalloc(sizeof(struct rpcbind_args), GFP_ATOMIC);
if (!map) { if (!map) {
status = -ENOMEM; status = -ENOMEM;
dprintk("RPC: %5u rpcb_getport no memory available\n", dprintk("RPC: %5u %s: no memory available\n",
task->tk_pid); task->tk_pid, __FUNCTION__);
goto bailout_nofree; goto bailout_nofree;
} }
map->r_prog = clnt->cl_prog; map->r_prog = clnt->cl_prog;
@ -376,8 +377,8 @@ void rpcb_getport(struct rpc_task *task)
rpcb_clnt = rpcb_create(clnt->cl_server, &addr, xprt->prot, bind_version, 0); rpcb_clnt = rpcb_create(clnt->cl_server, &addr, xprt->prot, bind_version, 0);
if (IS_ERR(rpcb_clnt)) { if (IS_ERR(rpcb_clnt)) {
status = PTR_ERR(rpcb_clnt); status = PTR_ERR(rpcb_clnt);
dprintk("RPC: %5u rpcb_getport rpcb_create failed, error %ld\n", dprintk("RPC: %5u %s: rpcb_create failed, error %ld\n",
task->tk_pid, PTR_ERR(rpcb_clnt)); task->tk_pid, __FUNCTION__, PTR_ERR(rpcb_clnt));
goto bailout; goto bailout;
} }
@ -385,8 +386,8 @@ void rpcb_getport(struct rpc_task *task)
rpc_release_client(rpcb_clnt); rpc_release_client(rpcb_clnt);
if (IS_ERR(child)) { if (IS_ERR(child)) {
status = -EIO; status = -EIO;
dprintk("RPC: %5u rpcb_getport rpc_run_task failed\n", dprintk("RPC: %5u %s: rpc_run_task failed\n",
task->tk_pid); task->tk_pid, __FUNCTION__);
goto bailout_nofree; goto bailout_nofree;
} }
rpc_put_task(child); rpc_put_task(child);

4
net/sunrpc/xprtsock.c
View file

@ -1473,7 +1473,7 @@ static struct rpc_xprt_ops xs_udp_ops = {
.set_buffer_size = xs_udp_set_buffer_size, .set_buffer_size = xs_udp_set_buffer_size,
.reserve_xprt = xprt_reserve_xprt_cong, .reserve_xprt = xprt_reserve_xprt_cong,
.release_xprt = xprt_release_xprt_cong, .release_xprt = xprt_release_xprt_cong,
.rpcbind = rpcb_getport, .rpcbind = rpcb_getport_async,
.set_port = xs_set_port, .set_port = xs_set_port,
.connect = xs_connect, .connect = xs_connect,
.buf_alloc = rpc_malloc, .buf_alloc = rpc_malloc,
@ -1490,7 +1490,7 @@ static struct rpc_xprt_ops xs_udp_ops = {
static struct rpc_xprt_ops xs_tcp_ops = { static struct rpc_xprt_ops xs_tcp_ops = {
.reserve_xprt = xprt_reserve_xprt, .reserve_xprt = xprt_reserve_xprt,
.release_xprt = xs_tcp_release_xprt, .release_xprt = xs_tcp_release_xprt,
.rpcbind = rpcb_getport, .rpcbind = rpcb_getport_async,
.set_port = xs_set_port, .set_port = xs_set_port,
.connect = xs_connect, .connect = xs_connect,
.buf_alloc = rpc_malloc, .buf_alloc = rpc_malloc,