Convert the semaphore to a mutex in net/9p/util.c Signed-off-by: Kevin Winchester --- net/9p/util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: v2.6.24-rc4/net/9p/util.c =================================================================== --- v2.6.24-rc4.orig/net/9p/util.c +++ v2.6.24-rc4/net/9p/util.c @@ -33,7 +33,7 @@ #include struct p9_idpool { - struct semaphore lock; + struct mutex lock; struct idr pool; }; @@ -45,7 +45,7 @@ struct p9_idpool *p9_idpool_create(void) if (!p) return ERR_PTR(-ENOMEM); - init_MUTEX(&p->lock); + mutex_init(&p->lock); idr_init(&p->pool); return p; @@ -76,14 +76,14 @@ retry: if (idr_pre_get(&p->pool, GFP_KERNEL) == 0) return 0; - if (down_interruptible(&p->lock) == -EINTR) { + if (mutex_lock_interruptible(&p->lock) == -EINTR) { P9_EPRINTK(KERN_WARNING, "Interrupted while locking\n"); return -1; } /* no need to store exactly p, we just need something non-null */ error = idr_get_new(&p->pool, p, &i); - up(&p->lock); + mutex_unlock(&p->lock); if (error == -EAGAIN) goto retry; @@ -104,12 +104,12 @@ EXPORT_SYMBOL(p9_idpool_get); void p9_idpool_put(int id, struct p9_idpool *p) { - if (down_interruptible(&p->lock) == -EINTR) { + if (mutex_lock_interruptible(&p->lock) == -EINTR) { P9_EPRINTK(KERN_WARNING, "Interrupted while locking\n"); return; } idr_remove(&p->pool, id); - up(&p->lock); + mutex_unlock(&p->lock); } EXPORT_SYMBOL(p9_idpool_put); -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/