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>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 330421e54713..3d432068f627 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;