diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-15 21:39:31 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 15:53:35 -0400 |
commit | 01e97e6517053d7c0b9af5248e944a9209909cf5 (patch) | |
tree | 30f57eededa62a390543b3a596d81006deb22384 /drivers/vhost/net.c | |
parent | a2dd3793a1c3ac709f1d7b48ad7751563f4c654f (diff) |
new helper: msg_data_left()
convert open-coded instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r-- | drivers/vhost/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 18f05bff8826..7d137a43cc86 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
@@ -357,13 +357,13 @@ static void handle_tx(struct vhost_net *net) | |||
357 | iov_iter_init(&msg.msg_iter, WRITE, vq->iov, out, len); | 357 | iov_iter_init(&msg.msg_iter, WRITE, vq->iov, out, len); |
358 | iov_iter_advance(&msg.msg_iter, hdr_size); | 358 | iov_iter_advance(&msg.msg_iter, hdr_size); |
359 | /* Sanity check */ | 359 | /* Sanity check */ |
360 | if (!iov_iter_count(&msg.msg_iter)) { | 360 | if (!msg_data_left(&msg)) { |
361 | vq_err(vq, "Unexpected header len for TX: " | 361 | vq_err(vq, "Unexpected header len for TX: " |
362 | "%zd expected %zd\n", | 362 | "%zd expected %zd\n", |
363 | len, hdr_size); | 363 | len, hdr_size); |
364 | break; | 364 | break; |
365 | } | 365 | } |
366 | len = iov_iter_count(&msg.msg_iter); | 366 | len = msg_data_left(&msg); |
367 | 367 | ||
368 | zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN | 368 | zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN |
369 | && (nvq->upend_idx + 1) % UIO_MAXIOV != | 369 | && (nvq->upend_idx + 1) % UIO_MAXIOV != |