diff options
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 16c9fbc1db6..c95a61736d1 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -410,7 +410,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old, | |||
410 | rpc_shutdown_client(clnt); | 410 | rpc_shutdown_client(clnt); |
411 | clnt = ERR_PTR(err); | 411 | clnt = ERR_PTR(err); |
412 | } | 412 | } |
413 | out: | 413 | out: |
414 | return clnt; | 414 | return clnt; |
415 | } | 415 | } |
416 | 416 | ||
@@ -431,7 +431,7 @@ static const struct rpc_call_ops rpc_default_ops = { | |||
431 | * sleeps on RPC calls | 431 | * sleeps on RPC calls |
432 | */ | 432 | */ |
433 | #define RPC_INTR_SIGNALS (sigmask(SIGHUP) | sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTERM)) | 433 | #define RPC_INTR_SIGNALS (sigmask(SIGHUP) | sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTERM)) |
434 | 434 | ||
435 | static void rpc_save_sigmask(sigset_t *oldset, int intr) | 435 | static void rpc_save_sigmask(sigset_t *oldset, int intr) |
436 | { | 436 | { |
437 | unsigned long sigallow = sigmask(SIGKILL); | 437 | unsigned long sigallow = sigmask(SIGKILL); |
@@ -474,7 +474,7 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags) | |||
474 | int status; | 474 | int status; |
475 | 475 | ||
476 | /* If this client is slain all further I/O fails */ | 476 | /* If this client is slain all further I/O fails */ |
477 | if (clnt->cl_dead) | 477 | if (clnt->cl_dead) |
478 | return -EIO; | 478 | return -EIO; |
479 | 479 | ||
480 | BUG_ON(flags & RPC_TASK_ASYNC); | 480 | BUG_ON(flags & RPC_TASK_ASYNC); |
@@ -515,7 +515,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags, | |||
515 | 515 | ||
516 | /* If this client is slain all further I/O fails */ | 516 | /* If this client is slain all further I/O fails */ |
517 | status = -EIO; | 517 | status = -EIO; |
518 | if (clnt->cl_dead) | 518 | if (clnt->cl_dead) |
519 | goto out_release; | 519 | goto out_release; |
520 | 520 | ||
521 | flags |= RPC_TASK_ASYNC; | 521 | flags |= RPC_TASK_ASYNC; |
@@ -526,7 +526,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags, | |||
526 | goto out_release; | 526 | goto out_release; |
527 | 527 | ||
528 | /* Mask signals on GSS_AUTH upcalls */ | 528 | /* Mask signals on GSS_AUTH upcalls */ |
529 | rpc_task_sigmask(task, &oldset); | 529 | rpc_task_sigmask(task, &oldset); |
530 | 530 | ||
531 | rpc_call_setup(task, msg, 0); | 531 | rpc_call_setup(task, msg, 0); |
532 | 532 | ||
@@ -537,7 +537,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags, | |||
537 | else | 537 | else |
538 | rpc_put_task(task); | 538 | rpc_put_task(task); |
539 | 539 | ||
540 | rpc_restore_sigmask(&oldset); | 540 | rpc_restore_sigmask(&oldset); |
541 | return status; | 541 | return status; |
542 | out_release: | 542 | out_release: |
543 | rpc_release_calldata(tk_ops, data); | 543 | rpc_release_calldata(tk_ops, data); |
@@ -749,7 +749,7 @@ call_allocate(struct rpc_task *task) | |||
749 | struct rpc_xprt *xprt = task->tk_xprt; | 749 | struct rpc_xprt *xprt = task->tk_xprt; |
750 | unsigned int bufsiz; | 750 | unsigned int bufsiz; |
751 | 751 | ||
752 | dprintk("RPC: %4d call_allocate (status %d)\n", | 752 | dprintk("RPC: %4d call_allocate (status %d)\n", |
753 | task->tk_pid, task->tk_status); | 753 | task->tk_pid, task->tk_status); |
754 | task->tk_action = call_bind; | 754 | task->tk_action = call_bind; |
755 | if (req->rq_buffer) | 755 | if (req->rq_buffer) |
@@ -761,7 +761,7 @@ call_allocate(struct rpc_task *task) | |||
761 | 761 | ||
762 | if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL) | 762 | if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL) |
763 | return; | 763 | return; |
764 | printk(KERN_INFO "RPC: buffer allocation failed for task %p\n", task); | 764 | printk(KERN_INFO "RPC: buffer allocation failed for task %p\n", task); |
765 | 765 | ||
766 | if (RPC_IS_ASYNC(task) || !signalled()) { | 766 | if (RPC_IS_ASYNC(task) || !signalled()) { |
767 | xprt_release(task); | 767 | xprt_release(task); |
@@ -798,7 +798,7 @@ call_encode(struct rpc_task *task) | |||
798 | kxdrproc_t encode; | 798 | kxdrproc_t encode; |
799 | __be32 *p; | 799 | __be32 *p; |
800 | 800 | ||
801 | dprintk("RPC: %4d call_encode (status %d)\n", | 801 | dprintk("RPC: %4d call_encode (status %d)\n", |
802 | task->tk_pid, task->tk_status); | 802 | task->tk_pid, task->tk_status); |
803 | 803 | ||
804 | /* Default buffer setup */ | 804 | /* Default buffer setup */ |
@@ -933,7 +933,7 @@ call_connect_status(struct rpc_task *task) | |||
933 | struct rpc_clnt *clnt = task->tk_client; | 933 | struct rpc_clnt *clnt = task->tk_client; |
934 | int status = task->tk_status; | 934 | int status = task->tk_status; |
935 | 935 | ||
936 | dprintk("RPC: %5u call_connect_status (status %d)\n", | 936 | dprintk("RPC: %5u call_connect_status (status %d)\n", |
937 | task->tk_pid, task->tk_status); | 937 | task->tk_pid, task->tk_status); |
938 | 938 | ||
939 | task->tk_status = 0; | 939 | task->tk_status = 0; |
@@ -966,7 +966,7 @@ call_connect_status(struct rpc_task *task) | |||
966 | static void | 966 | static void |
967 | call_transmit(struct rpc_task *task) | 967 | call_transmit(struct rpc_task *task) |
968 | { | 968 | { |
969 | dprintk("RPC: %4d call_transmit (status %d)\n", | 969 | dprintk("RPC: %4d call_transmit (status %d)\n", |
970 | task->tk_pid, task->tk_status); | 970 | task->tk_pid, task->tk_status); |
971 | 971 | ||
972 | task->tk_action = call_status; | 972 | task->tk_action = call_status; |
@@ -1028,7 +1028,7 @@ call_status(struct rpc_task *task) | |||
1028 | if (req->rq_received > 0 && !req->rq_bytes_sent) | 1028 | if (req->rq_received > 0 && !req->rq_bytes_sent) |
1029 | task->tk_status = req->rq_received; | 1029 | task->tk_status = req->rq_received; |
1030 | 1030 | ||
1031 | dprintk("RPC: %4d call_status (status %d)\n", | 1031 | dprintk("RPC: %4d call_status (status %d)\n", |
1032 | task->tk_pid, task->tk_status); | 1032 | task->tk_pid, task->tk_status); |
1033 | 1033 | ||
1034 | status = task->tk_status; | 1034 | status = task->tk_status; |
@@ -1118,7 +1118,7 @@ call_decode(struct rpc_task *task) | |||
1118 | kxdrproc_t decode = task->tk_msg.rpc_proc->p_decode; | 1118 | kxdrproc_t decode = task->tk_msg.rpc_proc->p_decode; |
1119 | __be32 *p; | 1119 | __be32 *p; |
1120 | 1120 | ||
1121 | dprintk("RPC: %4d call_decode (status %d)\n", | 1121 | dprintk("RPC: %4d call_decode (status %d)\n", |
1122 | task->tk_pid, task->tk_status); | 1122 | task->tk_pid, task->tk_status); |
1123 | 1123 | ||
1124 | if (task->tk_flags & RPC_CALL_MAJORSEEN) { | 1124 | if (task->tk_flags & RPC_CALL_MAJORSEEN) { |
@@ -1196,7 +1196,7 @@ static void | |||
1196 | call_refreshresult(struct rpc_task *task) | 1196 | call_refreshresult(struct rpc_task *task) |
1197 | { | 1197 | { |
1198 | int status = task->tk_status; | 1198 | int status = task->tk_status; |
1199 | dprintk("RPC: %4d call_refreshresult (status %d)\n", | 1199 | dprintk("RPC: %4d call_refreshresult (status %d)\n", |
1200 | task->tk_pid, task->tk_status); | 1200 | task->tk_pid, task->tk_status); |
1201 | 1201 | ||
1202 | task->tk_status = 0; | 1202 | task->tk_status = 0; |