aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-28 11:27:44 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-28 11:27:44 -0800
commita301e1703edc088592f8c5c16f9bdd34a0792776 (patch)
tree7a27abde4079ea65327d3550630108c1445cb6e9
parent0147fc058d11bd4009b126d09974d2c8f48fef15 (diff)
parent11cd1a8b8cad1acfc140d9acce93762a9c140b20 (diff)
downloadmrst-s0i3-test-a301e1703edc088592f8c5c16f9bdd34a0792776.tar.gz
mrst-s0i3-test-a301e1703edc088592f8c5c16f9bdd34a0792776.tar.xz
mrst-s0i3-test-a301e1703edc088592f8c5c16f9bdd34a0792776.zip
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
-rw-r--r--drivers/vhost/net.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 4b4da5b86ff..f442668a1e5 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;