Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

Pull 9p changes from Eric Van Hensbergen:
 "A bunch of updates and cleanup within the transport layer,
  particularly with a focus on RDMA"

* tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9pnet_rdma: check token type before int conversion
  9pnet: trans_fd : allocate struct p9_trans_fd and struct p9_conn together.
  9pnet: p9_client->conn field is unused. Remove it.
  9P: Get rid of REQ_STATUS_FLSH
  9pnet_rdma: add cancelled()
  9pnet_rdma: update request status during send
  9P: Add cancelled() to the transport functions.
  net: Mark function as static in 9p/client.c
  9P: Add memory barriers to protect request fields over cb/rpc threads handoff

diff --combined net/9p/trans_virtio.c
index ac2666c,a8c67e2..6940d8f
--- 1/net/9p/trans_virtio.c
--- 2/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@@ -164,8 -164,7 +164,7 @@@ static void req_done(struct virtqueue *
                p9_debug(P9_DEBUG_TRANS, ": rc %p\n", rc);
                p9_debug(P9_DEBUG_TRANS, ": lookup tag %d\n", rc->tag);
                req = p9_tag_lookup(chan->client, rc->tag);
-               req->status = REQ_STATUS_RCVD;
-               p9_client_cb(chan->client, req);
+               p9_client_cb(chan->client, req, REQ_STATUS_RCVD);
        }
  }
  
@@@ -340,10 -339,7 +339,10 @@@ static int p9_get_mapped_pages(struct v
                int count = nr_pages;
                while (nr_pages) {
                        s = rest_of_page(data);
 -                      pages[index++] = kmap_to_page(data);
 +                      if (is_vmalloc_addr(data))
 +                              pages[index++] = vmalloc_to_page(data);
 +                      else
 +                              pages[index++] = kmap_to_page(data);
                        data += s;
                        nr_pages--;
                }