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

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

xprtrdma: Clean up after adding regbuf management 



rpcrdma_{de}register_internal() are used only in verbs.c now.

MAX_RPCRDMAHDR is no longer used and can be removed.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent c05fbb5a

net/sunrpc/xprtrdma/verbs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1729,7 +1729,7 @@ rpcrdma_recv_buffer_put(struct rpcrdma_rep *rep) 
 * Wrappers for internal-use kmalloc memory registration, used by buffer code.

 * Wrappers for internal-use kmalloc memory registration, used by buffer code.

 */

 */





int

static int

rpcrdma_register_internal(struct rpcrdma_ia *ia, void *va, int len,

rpcrdma_register_internal(struct rpcrdma_ia *ia, void *va, int len,

				struct ib_mr **mrp, struct ib_sge *iov)

				struct ib_mr **mrp, struct ib_sge *iov)

{

{
@@ -1780,7 +1780,7 @@ rpcrdma_register_internal(struct rpcrdma_ia *ia, void *va, int len, 
	return rc;

	return rc;

}

}





int

static int

rpcrdma_deregister_internal(struct rpcrdma_ia *ia,

rpcrdma_deregister_internal(struct rpcrdma_ia *ia,

				struct ib_mr *mr, struct ib_sge *iov)

				struct ib_mr *mr, struct ib_sge *iov)

{

{

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -171,10 +171,6 @@ enum rpcrdma_chunktype { 
/* temporary static scatter/gather max */

/* temporary static scatter/gather max */

#define RPCRDMA_MAX_DATA_SEGS	(64)	/* max scatter/gather */

#define RPCRDMA_MAX_DATA_SEGS	(64)	/* max scatter/gather */

#define RPCRDMA_MAX_SEGS 	(RPCRDMA_MAX_DATA_SEGS + 2) /* head+tail = 2 */

#define RPCRDMA_MAX_SEGS 	(RPCRDMA_MAX_DATA_SEGS + 2) /* head+tail = 2 */

#define MAX_RPCRDMAHDR	(\

	/* max supported RPC/RDMA header */ \

	sizeof(struct rpcrdma_msg) + (2 * sizeof(u32)) + \

	(sizeof(struct rpcrdma_read_chunk) * RPCRDMA_MAX_SEGS) + sizeof(u32))





struct rpcrdma_buffer;

struct rpcrdma_buffer;
@@ -401,11 +397,6 @@ void rpcrdma_buffer_put(struct rpcrdma_req *); 
void rpcrdma_recv_buffer_get(struct rpcrdma_req *);

void rpcrdma_recv_buffer_get(struct rpcrdma_req *);

void rpcrdma_recv_buffer_put(struct rpcrdma_rep *);

void rpcrdma_recv_buffer_put(struct rpcrdma_rep *);





int rpcrdma_register_internal(struct rpcrdma_ia *, void *, int,

				struct ib_mr **, struct ib_sge *);

int rpcrdma_deregister_internal(struct rpcrdma_ia *,

				struct ib_mr *, struct ib_sge *);



int rpcrdma_register_external(struct rpcrdma_mr_seg *,

int rpcrdma_register_external(struct rpcrdma_mr_seg *,

				int, int, struct rpcrdma_xprt *);

				int, int, struct rpcrdma_xprt *);

int rpcrdma_deregister_external(struct rpcrdma_mr_seg *,

int rpcrdma_deregister_external(struct rpcrdma_mr_seg *,