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

Commit 7a27eae3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-for-4.0-3' of git://git.linux-nfs.org/projects/anna/nfs-rdma 



NFS: RDMA Client Sparse Fix #2

This patch fixes another sparse fix found by Dan Carpenter's tool.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>

* tag 'nfs-rdma-for-4.0-3' of git://git.linux-nfs.org/projects/anna/nfs-rdma:
  xprtrdma: Store RDMA credits in unsigned variables
parents c517d838 9b1dcbc8

net/sunrpc/xprtrdma/rpc_rdma.c

+2 −1
Original line number Diff line number Diff line
@@ -738,8 +738,9 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) 
	struct rpc_xprt *xprt = rep->rr_xprt;

	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);

	__be32 *iptr;

	int credits, rdmalen, status;

	int rdmalen, status;

	unsigned long cwnd;

	u32 credits;



	/* Check status. If bad, signal disconnect and return rep to pool */

	if (rep->rr_len == ~0U) {

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ rpcr_to_rdmar(struct rpc_rqst *rqst) 
 */

struct rpcrdma_buffer {

	spinlock_t	rb_lock;	/* protects indexes */

	int		rb_max_requests;/* client max requests */

	u32		rb_max_requests;/* client max requests */

	struct list_head rb_mws;	/* optional memory windows/fmrs/frmrs */

	struct list_head rb_all;

	int		rb_send_index;