From: Dotan Barak <dotanb@dev.mellanox.co.il>
Date: Thu, 7 Jun 2012 05:56:34 +0000 (+0300)
Subject: RDS: fixed compilation warnings
X-Git-Tag: v4.1.12-92~319^2^2~2^2~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=70b7f764b02033ab8f5d6d851976fc0e52f7d152;p=users%2Fjedix%2Flinux-maple.git

RDS: fixed compilation warnings

Fixed the following compilation warnings:

net/rds/send.c: In function 'rds_send_xmit':
net/rds/send.c:299: warning: suggest parentheses around && within ||
net/rds/rdma.c: In function 'rds_cmsg_rdma_dest':
net/rds/rdma.c:697: warning: format '%Lx' expects type 'long long unsigned int', but argument 2 has type 'u32'
net/rds/ib_recv.c: In function 'rds_ib_srqs_init':
net/rds/ib_recv.c:1570: warning: 'return' with no value, in function returning non-void

Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>
Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
---

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 74294ca90b92..878af33fc73f 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -1567,7 +1567,7 @@ int rds_ib_srqs_init(void)
 	int ret;
 
 	if (!rds_ib_srq_enabled)
-		return;
+		return 0;
 
 	list_for_each_entry(rds_ibdev, &rds_ib_devices, list) {
 		ret = rds_ib_srq_init(rds_ibdev);
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 466fbeff69f7..c5f630bc3fe1 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -694,7 +694,7 @@ int rds_cmsg_rdma_dest(struct rds_sock *rs, struct rds_message *rm,
 	spin_lock_irqsave(&rs->rs_rdma_lock, flags);
 	mr = rds_mr_tree_walk(&rs->rs_rdma_keys, r_key, NULL);
 	if (!mr) {
-		printk(KERN_ERR "rds_cmsg_rdma_dest: key %Lx\n", r_key);
+		printk(KERN_ERR "rds_cmsg_rdma_dest: key %x\n", r_key);
 		err = -EINVAL;	/* invalid r_key */
 	} else
 		atomic_inc(&mr->r_refcount);
diff --git a/net/rds/send.c b/net/rds/send.c
index 6245b17bc1d1..3ea05c59625b 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -294,8 +294,8 @@ restart:
 			 * with RDMA ops.
 			 */
 
-			if (rm->rdma.op_active
-			 && test_bit(RDS_MSG_RETRANSMITTED, &rm->m_flags)
+			if ((rm->rdma.op_active
+			 && test_bit(RDS_MSG_RETRANSMITTED, &rm->m_flags))
 			 || test_bit(RDS_MSG_FLUSH, &rm->m_flags)) {
 				spin_lock_irqsave(&conn->c_lock, flags);
 				if (test_and_clear_bit(RDS_MSG_ON_CONN, &rm->m_flags))