diff options
| author | Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | 2013-12-06 21:13:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-06 21:22:05 +0100 |
| commit | 59566b6e8cc8f8a05022e0f01a1b90974003f092 (patch) | |
| tree | a5b939d0eea7adb6c907d5bbe354eb93b5487cb2 /drivers/vhost/net.c | |
| parent | tg3: Update version to 3.135 (diff) | |
| download | linux-59566b6e8cc8f8a05022e0f01a1b90974003f092.tar.xz linux-59566b6e8cc8f8a05022e0f01a1b90974003f092.zip | |
vhost: remove the dead branch
Since vhost_dev_init() forever return 0, some branches are never run,
therefore need to be removed.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 831eb4fd197d..9a68409580d5 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -683,7 +683,7 @@ static int vhost_net_open(struct inode *inode, struct file *f) struct vhost_net *n = kmalloc(sizeof *n, GFP_KERNEL); struct vhost_dev *dev; struct vhost_virtqueue **vqs; - int r, i; + int i; if (!n) return -ENOMEM; @@ -706,12 +706,7 @@ static int vhost_net_open(struct inode *inode, struct file *f) n->vqs[i].vhost_hlen = 0; n->vqs[i].sock_hlen = 0; } - r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX); - if (r < 0) { - kfree(n); - kfree(vqs); - return r; - } + vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX); vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev); vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev); |