aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>2011-03-14 17:22:41 -0400
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-22 17:32:48 -0400
commit316ad5501c2098cb2a2a25ed77a0421f1671411c (patch)
tree7954b7c8988cf3f41fea54b8243dce6bc3e3ad2d /net
parenta01a984035ea799b14aa5e874dcaeb122f09c4b4 (diff)
[net/9p] Don't re-pin pages on retrying virtqueue_add_buf().
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/9p/trans_virtio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index cb98af9367ab..c6e1ae2fb926 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -262,7 +262,6 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
262 262
263 P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request\n"); 263 P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request\n");
264 264
265req_retry:
266 req->status = REQ_STATUS_SENT; 265 req->status = REQ_STATUS_SENT;
267 266
268 if (req->tc->pbuf_size && (req->tc->pubuf && P9_IS_USER_CONTEXT)) { 267 if (req->tc->pbuf_size && (req->tc->pubuf && P9_IS_USER_CONTEXT)) {
@@ -295,6 +294,7 @@ req_retry:
295 } 294 }
296 } 295 }
297 296
297req_retry_pinned:
298 spin_lock_irqsave(&chan->lock, flags); 298 spin_lock_irqsave(&chan->lock, flags);
299 299
300 /* Handle out VirtIO ring buffers */ 300 /* Handle out VirtIO ring buffers */
@@ -355,7 +355,7 @@ req_retry:
355 return err; 355 return err;
356 356
357 P9_DPRINTK(P9_DEBUG_TRANS, "9p:Retry virtio request\n"); 357 P9_DPRINTK(P9_DEBUG_TRANS, "9p:Retry virtio request\n");
358 goto req_retry; 358 goto req_retry_pinned;
359 } else { 359 } else {
360 spin_unlock_irqrestore(&chan->lock, flags); 360 spin_unlock_irqrestore(&chan->lock, flags);
361 P9_DPRINTK(P9_DEBUG_TRANS, 361 P9_DPRINTK(P9_DEBUG_TRANS,