From 9e5ee51cfcb8f2b9472a1617299bd1df46a55cbe Mon Sep 17 00:00:00 2001
From: Cong Wang <amwang@redhat.com>
Date: Sun, 3 Mar 2013 20:57:18 +0000
Subject: [PATCH] --- yaml --- r: 360827 b: refs/heads/master c:
 7dac1b514a00817ddb43704068c14ffd8b8fba19 h: refs/heads/master i:   360825:
 4ef49bb9acfe68509b5a1c86eee6f1a1cad7b119   360823:
 77a6e853d7aee01b540216a0b950a06ba60771a7 v: v3

---
 [refs]                  | 2 +-
 trunk/net/rds/message.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b7395df975e5..91e9ed7b4aef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acac8406cd523a3afbd6c6db31e9f763644bf6ba
+refs/heads/master: 7dac1b514a00817ddb43704068c14ffd8b8fba19
diff --git a/trunk/net/rds/message.c b/trunk/net/rds/message.c
index aff589cc022e..aba232f9f308 100644
--- a/trunk/net/rds/message.c
+++ b/trunk/net/rds/message.c
@@ -82,10 +82,7 @@ static void rds_message_purge(struct rds_message *rm)
 void rds_message_put(struct rds_message *rm)
 {
 	rdsdebug("put rm %p ref %d\n", rm, atomic_read(&rm->m_refcount));
-	if (atomic_read(&rm->m_refcount) == 0) {
-printk(KERN_CRIT "danger refcount zero on %p\n", rm);
-WARN_ON(1);
-	}
+	WARN(!atomic_read(&rm->m_refcount), "danger refcount zero on %p\n", rm);
 	if (atomic_dec_and_test(&rm->m_refcount)) {
 		BUG_ON(!list_empty(&rm->m_sock_item));
 		BUG_ON(!list_empty(&rm->m_conn_item));