commit 824044c19552e8a5f345781ccd1c2062673a41ad · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

David S. Miller 15 years ago 824044c1 fb0c5f0b

+4 -3

1 changed file

expand all

unified split

drivers

vhost

vhost.c

+4 -3

drivers/vhost/vhost.c

··· 858 if (r < 0) 859 return r; 860 len -= l; 861 - if (!len) 862 return 0; 863 } 864 - if (vq->log_ctx) 865 - eventfd_signal(vq->log_ctx, 1); 866 /* Length written exceeds what we have stored. This is a bug. */ 867 BUG(); 868 return 0;

··· 858 if (r < 0) 859 return r; 860 len -= l; 861 + if (!len) { 862 + if (vq->log_ctx) 863 + eventfd_signal(vq->log_ctx, 1); 864 return 0; 865 + } 866 } 867 /* Length written exceeds what we have stored. This is a bug. */ 868 BUG(); 869 return 0;