From: Eric Van Hensbergen Date: Thu, 7 Feb 2008 01:25:07 +0000 (-0600) Subject: 9p: Fix soft lockup in virtio transport X-Git-Tag: v2.6.25-rc1~511^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c7d90f2dda6daec5a6aaf8f97aacc10ee4deb77;p=linux-2.6-omap-h63xx.git 9p: Fix soft lockup in virtio transport This fixes a poorly placed spinlock which could result in a soft lockup condition. Signed-off-by: Eric Van Hensbergen --- diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 0f590227943..7853c31bd69 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -232,7 +232,6 @@ p9_virtio_rpc(struct p9_trans *t, struct p9_fcall *tc, struct p9_fcall **rc, rdata = (char *)*rc+sizeof(struct p9_fcall); - spin_lock_irqsave(&chan->lock, flags); n = P9_NOTAG; if (tc->id != P9_TVERSION) { n = p9_idpool_get(chan->tagpool); @@ -240,6 +239,7 @@ p9_virtio_rpc(struct p9_trans *t, struct p9_fcall *tc, struct p9_fcall **rc, return -ENOMEM; } + spin_lock_irqsave(&chan->lock, flags); req = p9_lookup_tag(chan, n); spin_unlock_irqrestore(&chan->lock, flags);