Skip to content

Commit

Permalink
svcrdma: Make map_xdr non-static
Browse files Browse the repository at this point in the history 
Pre-requisite to use map_xdr in the backchannel code.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Acked-by: Bruce Fields <bfields@fieldses.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
  • Loading branch information
Chuck Lever authored and Doug Ledford committed Jan 19, 2016
1 parent 78da2b3 commit ba986c9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions include/linux/sunrpc/svc_rdma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ extern int rdma_read_chunk_frmr(struct svcxprt_rdma *, struct svc_rqst *,
u32, u32, u64, bool);

/* svc_rdma_sendto.c */
extern int svc_rdma_map_xdr(struct svcxprt_rdma *, struct xdr_buf *,
struct svc_rdma_req_map *);
extern int svc_rdma_sendto(struct svc_rqst *);
extern struct rpcrdma_read_chunk *
svc_rdma_get_read_chunk(struct rpcrdma_msg *);
Expand Down
14 changes: 7 additions & 7 deletions net/sunrpc/xprtrdma/svc_rdma_sendto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@

#define RPCDBG_FACILITY RPCDBG_SVCXPRT

static int map_xdr(struct svcxprt_rdma *xprt,
struct xdr_buf *xdr,
struct svc_rdma_req_map *vec)
int svc_rdma_map_xdr(struct svcxprt_rdma *xprt,
struct xdr_buf *xdr,
struct svc_rdma_req_map *vec)
{
int sge_no;
u32 sge_bytes;
Expand All @@ -62,7 +62,7 @@ static int map_xdr(struct svcxprt_rdma *xprt,

if (xdr->len !=
(xdr->head[0].iov_len + xdr->page_len + xdr->tail[0].iov_len)) {
pr_err("svcrdma: map_xdr: XDR buffer length error\n");
pr_err("svcrdma: %s: XDR buffer length error\n", __func__);
return -EIO;
}

Expand Down Expand Up @@ -97,9 +97,9 @@ static int map_xdr(struct svcxprt_rdma *xprt,
sge_no++;
}

dprintk("svcrdma: map_xdr: sge_no %d page_no %d "
dprintk("svcrdma: %s: sge_no %d page_no %d "
"page_base %u page_len %u head_len %zu tail_len %zu\n",
sge_no, page_no, xdr->page_base, xdr->page_len,
__func__, sge_no, page_no, xdr->page_base, xdr->page_len,
xdr->head[0].iov_len, xdr->tail[0].iov_len);

vec->count = sge_no;
Expand Down Expand Up @@ -592,7 +592,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
ctxt = svc_rdma_get_context(rdma);
ctxt->direction = DMA_TO_DEVICE;
vec = svc_rdma_get_req_map(rdma);
ret = map_xdr(rdma, &rqstp->rq_res, vec);
ret = svc_rdma_map_xdr(rdma, &rqstp->rq_res, vec);
if (ret)
goto err0;
inline_bytes = rqstp->rq_res.len;
Expand Down

0 comments on commit ba986c9

Please sign in to comment.