aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/pmap_clnt.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-03 03:55:03 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 14:58:39 -0500
commitabbcf28f23d53e8ec56a91f3528743913fa2694a (patch)
tree97dafc3840e4660ac0fcf99bbdc7eddc2fecd08a /net/sunrpc/pmap_clnt.c
parentabd3e641d5ef9f836ab2f2b04d80b8619b051531 (diff)
SUNRPC: Yet more RPC cleanups
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/pmap_clnt.c')
-rw-r--r--net/sunrpc/pmap_clnt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index a398575f94b8..cad4568fbbe2 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -90,8 +90,7 @@ bailout:
90 map->pm_binding = 0; 90 map->pm_binding = 0;
91 rpc_wake_up(&map->pm_bindwait); 91 rpc_wake_up(&map->pm_bindwait);
92 spin_unlock(&pmap_lock); 92 spin_unlock(&pmap_lock);
93 task->tk_status = -EIO; 93 rpc_exit(task, -EIO);
94 task->tk_action = NULL;
95} 94}
96 95
97#ifdef CONFIG_ROOT_NFS 96#ifdef CONFIG_ROOT_NFS
@@ -138,11 +137,10 @@ pmap_getport_done(struct rpc_task *task)
138 task->tk_pid, task->tk_status, clnt->cl_port); 137 task->tk_pid, task->tk_status, clnt->cl_port);
139 if (task->tk_status < 0) { 138 if (task->tk_status < 0) {
140 /* Make the calling task exit with an error */ 139 /* Make the calling task exit with an error */
141 task->tk_action = NULL; 140 task->tk_action = rpc_exit_task;
142 } else if (clnt->cl_port == 0) { 141 } else if (clnt->cl_port == 0) {
143 /* Program not registered */ 142 /* Program not registered */
144 task->tk_status = -EACCES; 143 rpc_exit(task, -EACCES);
145 task->tk_action = NULL;
146 } else { 144 } else {
147 /* byte-swap port number first */ 145 /* byte-swap port number first */
148 clnt->cl_port = htons(clnt->cl_port); 146 clnt->cl_port = htons(clnt->cl_port);