Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

9p: use struct mutex instead of struct semaphore

Browse Source 
Replace semaphores protecting use flags with a mutex.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Acked-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Josef 'Jeff' Sipek 2008-03-07 11:39:13 -06:00 committed by Eric Van Hensbergen
parent bb8ffdfc3e
commit c1549497e9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/9p/trans_virtio.c
View File

@ -49,7 +49,7 @@
#define VIRTQUEUE_NUM 128 #define VIRTQUEUE_NUM 128
/* a single mutex to manage channel initialization and attachment */ /* a single mutex to manage channel initialization and attachment */
static DECLARE_MUTEX(virtio_9p_lock); static DEFINE_MUTEX(virtio_9p_lock);
/* global which tracks highest initialized channel */ /* global which tracks highest initialized channel */
static int chan_index; static int chan_index;
@ -211,9 +211,9 @@ static void p9_virtio_close(struct p9_trans *trans)
chan->max_tag = 0; chan->max_tag = 0;
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
down(&virtio_9p_lock); mutex_lock(&virtio_9p_lock);
chan->inuse = false; chan->inuse = false;
up(&virtio_9p_lock); mutex_unlock(&virtio_9p_lock);
kfree(trans); kfree(trans);
} }
@ -381,10 +381,10 @@ static int p9_virtio_probe(struct virtio_device *vdev)
struct virtio_chan *chan; struct virtio_chan *chan;
int index; int index;
down(&virtio_9p_lock); mutex_lock(&virtio_9p_lock);
index = chan_index++; index = chan_index++;
chan = &channels[index]; chan = &channels[index];
up(&virtio_9p_lock); mutex_unlock(&virtio_9p_lock);
if (chan_index > MAX_9P_CHAN) { if (chan_index > MAX_9P_CHAN) {
printk(KERN_ERR "9p: virtio: Maximum channels exceeded\n"); printk(KERN_ERR "9p: virtio: Maximum channels exceeded\n");
@ -413,9 +413,9 @@ static int p9_virtio_probe(struct virtio_device *vdev)
out_free_vq: out_free_vq:
vdev->config->del_vq(chan->vq); vdev->config->del_vq(chan->vq);
fail: fail:
down(&virtio_9p_lock); mutex_lock(&virtio_9p_lock);
chan_index--; chan_index--;
up(&virtio_9p_lock); mutex_unlock(&virtio_9p_lock);
return err; return err;
} }
@ -449,7 +449,7 @@ p9_virtio_create(const char *devname, char *args, int msize,
struct virtio_chan *chan = channels; struct virtio_chan *chan = channels;
int index = 0; int index = 0;
down(&virtio_9p_lock); mutex_lock(&virtio_9p_lock);
while (index < MAX_9P_CHAN) { while (index < MAX_9P_CHAN) {
if (chan->initialized && !chan->inuse) { if (chan->initialized && !chan->inuse) {
chan->inuse = true; chan->inuse = true;
@ -459,7 +459,7 @@ p9_virtio_create(const char *devname, char *args, int msize,
chan = &channels[index]; chan = &channels[index];
} }
} }
up(&virtio_9p_lock); mutex_unlock(&virtio_9p_lock);
if (index >= MAX_9P_CHAN) { if (index >= MAX_9P_CHAN) {
printk(KERN_ERR "9p: no channels available\n"); printk(KERN_ERR "9p: no channels available\n");