forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	net/bluetooth/l2cap_core.c
This commit is contained in:
David S. Miller 2011-07-14 07:56:40 -07:00
commit 6a7ebdf2fd
350 changed files with 26461 additions and 1789 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/sunrpc/rpcb_clnt.c
View file

@ -597,7 +597,7 @@ void rpcb_getport_async(struct rpc_task *task)
u32 bind_version;
struct rpc_xprt *xprt;
struct rpc_clnt *rpcb_clnt;
static struct rpcbind_args *map;
struct rpcbind_args *map;
struct rpc_task *child;
struct sockaddr_storage addr;
struct sockaddr *sap = (struct sockaddr *)&addr;

27
net/sunrpc/sched.c
View file

@ -616,30 +616,25 @@ static void __rpc_execute(struct rpc_task *task)
BUG_ON(RPC_IS_QUEUED(task));
for (;;) {
void (*do_action)(struct rpc_task *);
/*
* Execute any pending callback.
* Execute any pending callback first.
*/
if (task->tk_callback) {
void (*save_callback)(struct rpc_task *);
/*
* We set tk_callback to NULL before calling it,
* in case it sets the tk_callback field itself:
*/
save_callback = task->tk_callback;
task->tk_callback = NULL;
save_callback(task);
} else {
do_action = task->tk_callback;
task->tk_callback = NULL;
if (do_action == NULL) {
/*
* Perform the next FSM step.
* tk_action may be NULL when the task has been killed
* by someone else.
* tk_action may be NULL if the task has been killed.
* In particular, note that rpc_killall_tasks may
* do this at any time, so beware when dereferencing.
*/
if (task->tk_action == NULL)
do_action = task->tk_action;
if (do_action == NULL)
break;
task->tk_action(task);
}
do_action(task);
/*
* Lockless check for whether task is sleeping or not.