diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-28 20:27:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-28 20:27:44 +0100 |
| commit | a301e1703edc088592f8c5c16f9bdd34a0792776 (patch) | |
| tree | 7a27abde4079ea65327d3550630108c1445cb6e9 | |
| parent | tcp: restrict net.ipv4.tcp_adv_win_scale (#20312) (diff) | |
| parent | vhost/net: fix rcu check usage (diff) | |
| download | linux-a301e1703edc088592f8c5c16f9bdd34a0792776.tar.xz linux-a301e1703edc088592f8c5c16f9bdd34a0792776.zip | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
| -rw-r--r-- | drivers/vhost/net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 4b4da5b86ff9..f442668a1e52 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -129,8 +129,9 @@ static void handle_tx(struct vhost_net *net) size_t hdr_size; struct socket *sock; - sock = rcu_dereference_check(vq->private_data, - lockdep_is_held(&vq->mutex)); + /* TODO: check that we are running from vhost_worker? + * Not sure it's worth it, it's straight-forward enough. */ + sock = rcu_dereference_check(vq->private_data, 1); if (!sock) return; |