Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec482cc1 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Fix sparse warnings 



linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63: warning: incorrect type in argument 5 (different base types)
linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63:    expected unsigned int [usertype] xid
linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63:    got restricted __be32 [usertype] rq_xid
linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62: warning: incorrect type in argument 5 (different base types)
linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62:    expected unsigned int [usertype] xid
linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62:    got restricted __be32 [usertype] rq_xid
linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62: warning: incorrect type in argument 5 (different base types)
linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62:    expected unsigned int [usertype] xid
linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62:    got restricted __be32 [usertype] rq_xid

Fixes: 0a93fbcb ("xprtrdma: Plant XID in on-the-wire RDMA ... ")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent d1393711

net/sunrpc/xprtrdma/frwr_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc) 
 */

struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,

				struct rpcrdma_mr_seg *seg,

				int nsegs, bool writing, u32 xid,

				int nsegs, bool writing, __be32 xid,

				struct rpcrdma_mr **out)

{

	struct rpcrdma_ia *ia = &r_xprt->rx_ia;
@@ -446,7 +446,7 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt, 
		goto out_mapmr_err;



	ibmr->iova &= 0x00000000ffffffff;

	ibmr->iova |= ((u64)cpu_to_be32(xid)) << 32;

	ibmr->iova |= ((u64)be32_to_cpu(xid)) << 32;

	key = (u8)(ibmr->rkey & 0x000000FF);

	ib_update_fast_reg_key(ibmr, ++key);

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ void frwr_release_mr(struct rpcrdma_mr *mr); 
size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt);

struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,

				struct rpcrdma_mr_seg *seg,

				int nsegs, bool writing, u32 xid,

				int nsegs, bool writing, __be32 xid,

				struct rpcrdma_mr **mr);

int frwr_send(struct rpcrdma_ia *ia, struct rpcrdma_req *req);

void frwr_reminv(struct rpcrdma_rep *rep, struct list_head *mrs);