summaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-01-12 15:44:42 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-01-12 15:44:42 +1030
commitf96fde41f7f9af6cf20f6a1919f5d9670f84d574 (patch)
tree14b8a0343b255989ac8ba0ea34e18dca419723df /net/9p
parent5dfc17628d57f9e62043ed0cba03a6e3eb019a78 (diff)
downloadop-kernel-dev-f96fde41f7f9af6cf20f6a1919f5d9670f84d574.zip
op-kernel-dev-f96fde41f7f9af6cf20f6a1919f5d9670f84d574.tar.gz
virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf
Remove wrapper functions. This makes the allocation type explicit in all callers; I used GPF_KERNEL where it seemed obvious, left it at GFP_ATOMIC otherwise. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_virtio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 330421e..3d43206 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -272,7 +272,8 @@ req_retry:
in = pack_sg_list(chan->sg, out,
VIRTQUEUE_NUM, req->rc->sdata, req->rc->capacity);
- err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);
+ err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc,
+ GFP_ATOMIC);
if (err < 0) {
if (err == -ENOSPC) {
chan->ring_bufs_avail = 0;
@@ -414,7 +415,8 @@ req_retry_pinned:
in += pack_sg_list_p(chan->sg, out + in, VIRTQUEUE_NUM,
in_pages, in_nr_pages, uidata, inlen);
- err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);
+ err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc,
+ GFP_ATOMIC);
if (err < 0) {
if (err == -ENOSPC) {
chan->ring_bufs_avail = 0;
OpenPOWER on IntegriCloud