hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: console: rename cvq_lock to c_ivq_lock 

The cvq_lock was taken for the c_ivq.  Rename the lock to make that
obvious.

We'll also add a lock around the c_ovq in the next commit, so there's no
ambiguity.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Reviewed-by: Asias He <asias@redhat.com>
Reviewed-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
This commit is contained in:
Amit Shah 2013-03-29 16:30:07 +05:30 committed by Rusty Russell
parent b7d44d9487
commit 165b1b8bbc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/char/virtio_console.c
View File

@ -149,7 +149,7 @@ struct ports_device {
spinlock_t ports_lock; spinlock_t ports_lock;
/* To protect the vq operations for the control channel */ /* To protect the vq operations for the control channel */
spinlock_t cvq_lock; spinlock_t c_ivq_lock;
/* The current config space is stored here */ /* The current config space is stored here */
struct virtio_console_config config; struct virtio_console_config config;
@ -1709,23 +1709,23 @@ static void control_work_handler(struct work_struct *work)
portdev = container_of(work, struct ports_device, control_work); portdev = container_of(work, struct ports_device, control_work);
vq = portdev->c_ivq; vq = portdev->c_ivq;
spin_lock(&portdev->cvq_lock); spin_lock(&portdev->c_ivq_lock);
while ((buf = virtqueue_get_buf(vq, &len))) { while ((buf = virtqueue_get_buf(vq, &len))) {
spin_unlock(&portdev->cvq_lock); spin_unlock(&portdev->c_ivq_lock);
buf->len = len; buf->len = len;
buf->offset = 0; buf->offset = 0;
handle_control_message(portdev, buf); handle_control_message(portdev, buf);
spin_lock(&portdev->cvq_lock); spin_lock(&portdev->c_ivq_lock);
if (add_inbuf(portdev->c_ivq, buf) < 0) { if (add_inbuf(portdev->c_ivq, buf) < 0) {
dev_warn(&portdev->vdev->dev, dev_warn(&portdev->vdev->dev,
"Error adding buffer to queue\n"); "Error adding buffer to queue\n");
free_buf(buf, false); free_buf(buf, false);
} }
} }
spin_unlock(&portdev->cvq_lock); spin_unlock(&portdev->c_ivq_lock);
} }
static void out_intr(struct virtqueue *vq) static void out_intr(struct virtqueue *vq)
@ -1996,10 +1996,11 @@ static int virtcons_probe(struct virtio_device *vdev)
if (multiport) { if (multiport) {
unsigned int nr_added_bufs; unsigned int nr_added_bufs;
spin_lock_init(&portdev->cvq_lock); spin_lock_init(&portdev->c_ivq_lock);
INIT_WORK(&portdev->control_work, &control_work_handler); INIT_WORK(&portdev->control_work, &control_work_handler);
nr_added_bufs = fill_queue(portdev->c_ivq, &portdev->cvq_lock); nr_added_bufs = fill_queue(portdev->c_ivq,
&portdev->c_ivq_lock);
if (!nr_added_bufs) { if (!nr_added_bufs) {
dev_err(&vdev->dev, dev_err(&vdev->dev,
"Error allocating buffers for control queue\n"); "Error allocating buffers for control queue\n");
@ -2150,7 +2151,7 @@ static int virtcons_restore(struct virtio_device *vdev)
return ret; return ret;
if (use_multiport(portdev)) if (use_multiport(portdev))
fill_queue(portdev->c_ivq, &portdev->cvq_lock); fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
list_for_each_entry(port, &portdev->ports, list) { list_for_each_entry(port, &portdev->ports, list) {
port->in_vq = portdev->in_vqs[port->id]; port->in_vq = portdev->in_vqs[port->id];