lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Browse Source 
Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
This commit is contained in:
Trond Myklebust
2006-12-07 15:48:15 -05:00
parent 5847e1f4d0 620034c84d
commit 34161db6b1
558 changed files with 8324 additions and 5256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/sunrpc/sched.c
View File

@ -41,7 +41,7 @@ static mempool_t *rpc_buffer_mempool __read_mostly;
static void __rpc_default_timer(struct rpc_task *task);
static void rpciod_killall(void);
static void rpc_async_schedule(void *);
static void rpc_async_schedule(struct work_struct *);
/*
* RPC tasks sit here while waiting for conditions to improve.
@ -323,7 +323,7 @@ static void rpc_make_runnable(struct rpc_task *task)
if (RPC_IS_ASYNC(task)) {
int status;
INIT_WORK(&task->u.tk_work, rpc_async_schedule, (void *)task);
INIT_WORK(&task->u.tk_work, rpc_async_schedule);
status = queue_work(task->tk_workqueue, &task->u.tk_work);
if (status < 0) {
printk(KERN_WARNING "RPC: failed to add task to queue: error: %d!\n", status);
@ -729,9 +729,9 @@ rpc_execute(struct rpc_task *task)
return __rpc_execute(task);
}
static void rpc_async_schedule(void *arg)
static void rpc_async_schedule(struct work_struct *work)
{
__rpc_execute((struct rpc_task *)arg);
__rpc_execute(container_of(work, struct rpc_task, u.tk_work));
}
/**