Skip to contentSkip to conversation

net/rds: Fix new sparse warning

PATCH Applied David Ahern 2 participants 2 messages May 4, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/rds: Fix new sparse warning

c0adf54a109 introduced new sparse warnings:
CHECK /home/dahern/kernels/linux.git/net/rds/ib_cm.c
net/rds/ib_cm.c:191:34: warning: incorrect type in initializer (different base types)
net/rds/ib_cm.c:191:34: expected unsigned long long [unsigned] [usertype] dp_ack_seq
net/rds/ib_cm.c:191:34: got restricted __be64 <noident>
net/rds/ib_cm.c:194:51: warning: cast to restricted __be64

The temporary variable for sequence number should have been declared as __be64 rather than u64. Make it so.

Cc shamir rabinovitch <[email protected]>
---
 net/rds/ib_cm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/rds/ib_cm.c +1 -1
index 29144a6..8a09ee7 100644
@@ -188,7 +188,7 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
 		 * Since dp_ack_seq is 64-bit extended load operations can be
 		 * used so go through get_unaligned to avoid unaligned errors.
 		 */
-		u64 dp_ack_seq = get_unaligned(&dp->dp_ack_seq);
+		__be64 dp_ack_seq = get_unaligned(&dp->dp_ack_seq);
 
 		if (dp_ack_seq)
 			rds_send_drop_acked(conn, be64_to_cpu(dp_ack_seq),
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: David Ahern <[email protected]>
Date: Mon, 4 May 2015 11:51:38 -0400

Quoted 11 lines

c0adf54a109 introduced new sparse warnings:
CHECK /home/dahern/kernels/linux.git/net/rds/ib_cm.c
net/rds/ib_cm.c:191:34: warning: incorrect type in initializer (different base types)
net/rds/ib_cm.c:191:34: expected unsigned long long [unsigned] [usertype] dp_ack_seq
net/rds/ib_cm.c:191:34: got restricted __be64 <noident>
net/rds/ib_cm.c:194:51: warning: cast to restricted __be64

The temporary variable for sequence number should have been declared as __be64 rather than u64. Make it so.

Applied, thanks David.