leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'linus'

Browse Source
This commit is contained in:
Trond Myklebust
2006-03-23 23:44:19 -05:00
parent ac58c9059d 674a396c6d
commit 1ebbe2b200
2612 changed files with 133972 additions and 100561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/sunrpc/sched.c
View File

@@ -18,6 +18,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/xprt.h>
@@ -62,7 +63,7 @@ static LIST_HEAD(all_tasks);
/*
* rpciod-related stuff
*/
static DECLARE_MUTEX(rpciod_sema);
static DEFINE_MUTEX(rpciod_mutex);
static unsigned int rpciod_users;
struct workqueue_struct *rpciod_workqueue;
@@ -1055,7 +1056,7 @@ rpciod_up(void)
struct workqueue_struct *wq;
int error = 0;
down(&rpciod_sema);
mutex_lock(&rpciod_mutex);
dprintk("rpciod_up: users %d\n", rpciod_users);
rpciod_users++;
if (rpciod_workqueue)
@@ -1078,14 +1079,14 @@ rpciod_up(void)
rpciod_workqueue = wq;
error = 0;
out:
up(&rpciod_sema);
mutex_unlock(&rpciod_mutex);
return error;
}
void
rpciod_down(void)
{
down(&rpciod_sema);
mutex_lock(&rpciod_mutex);
dprintk("rpciod_down sema %d\n", rpciod_users);
if (rpciod_users) {
if (--rpciod_users)
@@ -1102,7 +1103,7 @@ rpciod_down(void)
destroy_workqueue(rpciod_workqueue);
rpciod_workqueue = NULL;
out:
up(&rpciod_sema);
mutex_unlock(&rpciod_mutex);
}
#ifdef RPC_DEBUG