Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / net / rds / send.c

diff --git a/net/rds/send.c b/net/rds/send.c
index d58ae5f..aa57e22 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"
 
@@ -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;