summaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-14 14:12:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-14 14:12:59 -0700
commit35c99ffa20edd3c24be352d28a63cd3a23121282 (patch)
tree4a844d58d3a5648025f48821198ef04f643a857e /drivers/vhost
parent814137768b5a9504f758aa760e7b1ac355539783 (diff)
parent050f4c4d2fbbd8217d94dc21051cc597d2a6848b (diff)
downloadlinux-stable-35c99ffa20edd3c24be352d28a63cd3a23121282.tar.gz
linux-stable-35c99ffa20edd3c24be352d28a63cd3a23121282.tar.bz2
linux-stable-35c99ffa20edd3c24be352d28a63cd3a23121282.zip
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin: - enable packed ring support for s390 - several fixes * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio/s390: enable packed ring virtio/s390: DMA support for virtio-ccw virtio/s390: use vring_create_virtqueue virtio/virtio_ring: do some comment fixes vhost-scsi: remove incorrect memory barrier tools/virtio/ringtest: Remove bogus definition of BUG_ON() virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/scsi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 618fb6461017..c090d177bd75 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1443,7 +1443,6 @@ vhost_scsi_set_endpoint(struct vhost_scsi *vs,
tpg->tv_tpg_vhost_count++;
tpg->vhost_scsi = vs;
vs_tpg[tpg->tport_tpgt] = tpg;
- smp_mb__after_atomic();
match = true;
}
mutex_unlock(&tpg->tv_tpg_mutex);