[rds-devel] [PATCH 1/2] RDS: Fix miscellaneous compile warnings

Olaf Kirch olaf.kirch at oracle.com
Wed Nov 14 10:12:03 PST 2007


From: Olaf Kirch <olaf.kirch at oracle.com>

RDS: Fix miscellaneous compile warnings

Signed-off-by: Olaf Kirch <olaf.kirch at oracle.com>
---
 net/rds/ib_send.c |    2 +-
 net/rds/rdma.c    |    5 ++---
 net/rds/rds.h     |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

Index: ofa-kernel-1.3plus/net/rds/ib_send.c
===================================================================
--- ofa-kernel-1.3plus.orig/net/rds/ib_send.c
+++ ofa-kernel-1.3plus/net/rds/ib_send.c
@@ -53,7 +53,7 @@ void rds_ib_send_unmap_rm(struct rds_ib_
 
 	/* raise rdma completion hwm */
 	if (send->s_rm->m_rdma_op) {
-	  long long flags;
+	  unsigned long flags;
 
 	  /* no longer need the atomics now that we use the spinlocks */
 	  /* the spinlock protects the atomic test of hwm and insert into waitq */
Index: ofa-kernel-1.3plus/net/rds/rdma.c
===================================================================
--- ofa-kernel-1.3plus.orig/net/rds/rdma.c
+++ ofa-kernel-1.3plus/net/rds/rdma.c
@@ -132,7 +132,7 @@ static void rds_mr_put(struct rds_sock *
 	unsigned long i;
 
 	rdsdebug("RDS/IB: put mr release key is %Lx refcnt %u\n",
-			mr->r_key, mr->r_refcount);
+			mr->r_key, atomic_read(&mr->r_refcount));
 
 	if (!atomic_dec_and_test(&mr->r_refcount))
 		return;
@@ -355,7 +355,6 @@ out:
 
 int rds_barrier(struct rds_sock *rs, char __user *optval, int optlen)
 {
-	struct sock *sk = rds_rs_to_sk(rs);
 	struct rds_barrier_args args;
 	int ret = 0;
 	u64 rdma_id;
@@ -389,7 +388,7 @@ int rds_barrier(struct rds_sock *rs, cha
 	      ret = -EAGAIN;
 	      goto out2;
 	    }
-	    rs->rs_transport->barrier_wait(args.wait_rdma_id);
+	    ret = rs->rs_transport->barrier_wait(args.wait_rdma_id);
 	  }
  out2:
 	rdma_id = rs->rs_transport->read_barrier_hwm();
Index: ofa-kernel-1.3plus/net/rds/rds.h
===================================================================
--- ofa-kernel-1.3plus.orig/net/rds/rds.h
+++ ofa-kernel-1.3plus/net/rds/rds.h
@@ -293,7 +293,7 @@ struct rds_transport {
 	void (*free_mr)(void *trans_private, int invalidate,
 			struct scatterlist *sg, int nents);
 	u64 (*read_barrier_hwm)(void);
-	u64 (*barrier_wait)(u64 rdma_id);
+	int (*barrier_wait)(u64 rdma_id);
 };
 
 /*

-- 
Olaf Kirch  |  --- o --- Nous sommes du soleil we love when we play
okir at lst.de |    / | \   sol.dhoop.naytheet.ah kin.ir.samse.qurax



More information about the rds-devel mailing list