diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 14:29:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 14:29:27 -0800 |
| commit | 2439f9766d31eb17584c0e89351a1ec8d1c1d507 (patch) | |
| tree | f14ccdfcb36f8d794bb46036b019a83b69250915 /net | |
| parent | 1388c80438e69fc01d83fbe98da3cac24c3c8731 (diff) | |
| parent | fa08a3b4eba59429cf7e241a7af089103e79160f (diff) | |
| download | linux-2439f9766d31eb17584c0e89351a1ec8d1c1d507.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"This includes a bugfix for virtio 9p fs. It also fixes hybernation for
s390 guests with virtio devices"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio/s390: implement PM operations for virtio_ccw
9p/trans_virtio: discard zero-length reply
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/trans_virtio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index f3a4efcf1456..3aa5a93ad107 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -160,7 +160,8 @@ static void req_done(struct virtqueue *vq) spin_unlock_irqrestore(&chan->lock, flags); /* Wakeup if anyone waiting for VirtIO ring space. */ wake_up(chan->vc_wq); - p9_client_cb(chan->client, req, REQ_STATUS_RCVD); + if (len) + p9_client_cb(chan->client, req, REQ_STATUS_RCVD); } } |