On Mon, Nov 29, 2010 at 01:48:40PM +0800, Jason Wang wrote: > Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx> Applied, thanks. > --- > drivers/vhost/net.c | 2 +- > drivers/vhost/vhost.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index d10da28..14fc189 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -452,7 +452,7 @@ static void handle_rx_mergeable(struct vhost_net *net) > move_iovec_hdr(vq->iov, vq->hdr, vhost_hlen, in); > else > /* Copy the header for use in VIRTIO_NET_F_MRG_RXBUF: > - * needed because sendmsg can modify msg_iov. */ > + * needed because recvmsg can modify msg_iov. */ > copy_iovec_hdr(vq->iov, vq->hdr, sock_hlen, in); > msg.msg_iovlen = in; > err = sock->ops->recvmsg(NULL, sock, &msg, > diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h > index 073d06a..2af44b7 100644 > --- a/drivers/vhost/vhost.h > +++ b/drivers/vhost/vhost.h > @@ -102,7 +102,7 @@ struct vhost_virtqueue { > * flush the vhost_work instead of synchronize_rcu. Therefore readers do > * not need to call rcu_read_lock/rcu_read_unlock: the beginning of > * vhost_work execution acts instead of rcu_read_lock() and the end of > - * vhost_work execution acts instead of rcu_read_lock(). > + * vhost_work execution acts instead of rcu_read_unlock(). > * Writers use virtqueue mutex. */ > void __rcu *private_data; > /* Log write descriptors */ -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html