Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / net / rds / send.c

diff --git a/net/rds/send.c b/net/rds/send.c
index 35b9c2e9caf1bc79235b9b43732d398a325d42f4..aa57e22539ef2f905e6469079e4f7105a4b6ceaa 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -35,6 +35,7 @@
 #include <net/sock.h>
 #include <linux/in.h>
 #include <linux/list.h>
+#include <linux/ratelimit.h>
 
 #include "rds.h"
 
@@ -116,7 +117,7 @@ static void release_in_xmit(struct rds_connection *conn)
 }
 
 /*
- * We're making the concious trade-off here to only send one message
+ * We're making the conscious trade-off here to only send one message
  * down the connection at a time.
  *   Pro:
  *      - tx queueing is a simple fifo list
@@ -1006,16 +1007,14 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
                goto out;
 
        if (rm->rdma.op_active && !conn->c_trans->xmit_rdma) {
-               if (printk_ratelimit())
-                       printk(KERN_NOTICE "rdma_op %p conn xmit_rdma %p\n",
+               printk_ratelimited(KERN_NOTICE "rdma_op %p conn xmit_rdma %p\n",
                               &rm->rdma, conn->c_trans->xmit_rdma);
                ret = -EOPNOTSUPP;
                goto out;
        }
 
        if (rm->atomic.op_active && !conn->c_trans->xmit_atomic) {
-               if (printk_ratelimit())
-                       printk(KERN_NOTICE "atomic_op %p conn xmit_atomic %p\n",
+               printk_ratelimited(KERN_NOTICE "atomic_op %p conn xmit_atomic %p\n",
                               &rm->atomic, conn->c_trans->xmit_atomic);
                ret = -EOPNOTSUPP;
                goto out;