Skip to content

Commit

Permalink
SUNRPC: another pmap wakeup fix
Browse files Browse the repository at this point in the history
Don't wake up bind waiters if a task finds that another task is already
trying to bind.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed Dec 6, 2006
1 parent a180304 commit 2b577f1
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/sunrpc/pmap_clnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ void rpc_getport(struct rpc_task *task)
/* Autobind on cloned rpc clients is discouraged */
BUG_ON(clnt->cl_parent != clnt);

status = -EACCES; /* tell caller to check again */
if (xprt_test_and_set_binding(xprt))
goto bailout_nowake;

/* Put self on queue before sending rpcbind request, in case
* pmap_getport_done completes before we return from rpc_run_task */
rpc_sleep_on(&xprt->binding, task, NULL, NULL);

status = -EACCES; /* tell caller to check again */
if (xprt_test_and_set_binding(xprt))
goto bailout_nofree;

/* Someone else may have bound if we slept */
status = 0;
if (xprt_bound(xprt))
Expand Down Expand Up @@ -143,8 +143,9 @@ void rpc_getport(struct rpc_task *task)
pmap_map_free(map);
xprt_put(xprt);
bailout_nofree:
task->tk_status = status;
pmap_wake_portmap_waiters(xprt, status);
bailout_nowake:
task->tk_status = status;
}

#ifdef CONFIG_ROOT_NFS
Expand Down

0 comments on commit 2b577f1

Please sign in to comment.