Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-3.10.git] / drivers / target / tcm_fc / tfc_io.c
index 3563a90..8e2a46d 100644 (file)
@@ -39,6 +39,7 @@
 #include <linux/configfs.h>
 #include <linux/ctype.h>
 #include <linux/hash.h>
+#include <linux/ratelimit.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
@@ -53,7 +54,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 
 #include "tcm_fc.h"
@@ -176,8 +176,7 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
                error = lport->tt.seq_send(lport, cmd->seq, fp);
                if (error) {
                        /* XXX For now, initiator will retry */
-                       if (printk_ratelimit())
-                               printk(KERN_ERR "%s: Failed to send frame %p, "
+                       pr_err_ratelimited("%s: Failed to send frame %p, "
                                                "xid <0x%x>, remaining %zu, "
                                                "lso_max <0x%x>\n",
                                                __func__, fp, ep->xid,
@@ -222,7 +221,7 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
         */
        buf = fc_frame_payload_get(fp, 1);
        if (cmd->was_ddp_setup && buf) {
-               printk(KERN_INFO "%s: When DDP was setup, not expected to"
+               pr_debug("%s: When DDP was setup, not expected to"
                                 "receive frame with payload, Payload shall be"
                                 "copied directly to buffer instead of coming "
                                 "via. legacy receive queues\n", __func__);
@@ -260,7 +259,7 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
                         * this point, but just in case if required in future
                         * for debugging or any other purpose
                         */
-                       printk(KERN_ERR "%s: Received frame with TSI bit not"
+                       pr_err("%s: Received frame with TSI bit not"
                                        " being SET, dropping the frame, "
                                        "cmd->sg <%p>, cmd->sg_cnt <0x%x>\n",
                                        __func__, cmd->sg, cmd->sg_cnt);