Skip to content

Commit

Permalink
vhost-net: don't open-code kvfree
Browse files Browse the repository at this point in the history
Commit 23cc5a9 ("vhost-net: extend device allocation to vmalloc")
added another open-coded version of kvfree (which is available since
v3.15-rc5), nuke it.

Signed-off-by: Romain Francoise <romain@orebokech.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Romain Francoise authored and Michael S. Tsirkin committed Jun 23, 2014
1 parent a497c3b commit d04257b
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/vhost/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,6 @@ static void handle_rx_net(struct vhost_work *work)
handle_rx(net);
}

static void vhost_net_free(void *addr)
{
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}

static int vhost_net_open(struct inode *inode, struct file *f)
{
struct vhost_net *n;
Expand All @@ -723,7 +715,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
}
vqs = kmalloc(VHOST_NET_VQ_MAX * sizeof(*vqs), GFP_KERNEL);
if (!vqs) {
vhost_net_free(n);
kvfree(n);
return -ENOMEM;
}

Expand Down Expand Up @@ -840,7 +832,7 @@ static int vhost_net_release(struct inode *inode, struct file *f)
* since jobs can re-queue themselves. */
vhost_net_flush(n);
kfree(n->dev.vqs);
vhost_net_free(n);
kvfree(n);
return 0;
}

Expand Down

0 comments on commit d04257b

Please sign in to comment.