diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /drivers/target/tcm_fc/tfc_io.c | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'drivers/target/tcm_fc/tfc_io.c')
| -rw-r--r-- | drivers/target/tcm_fc/tfc_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c index b4433bec6934..834a74ee5575 100644 --- a/drivers/target/tcm_fc/tfc_io.c +++ b/drivers/target/tcm_fc/tfc_io.c | |||
| @@ -202,7 +202,7 @@ int ft_queue_data_in(struct se_cmd *se_cmd) | |||
| 202 | /* XXX For now, initiator will retry */ | 202 | /* XXX For now, initiator will retry */ |
| 203 | if (printk_ratelimit()) | 203 | if (printk_ratelimit()) |
| 204 | printk(KERN_ERR "%s: Failed to send frame %p, " | 204 | printk(KERN_ERR "%s: Failed to send frame %p, " |
| 205 | "xid <0x%x>, remaining <0x%x>, " | 205 | "xid <0x%x>, remaining %zu, " |
| 206 | "lso_max <0x%x>\n", | 206 | "lso_max <0x%x>\n", |
| 207 | __func__, fp, ep->xid, | 207 | __func__, fp, ep->xid, |
| 208 | remaining, lport->lso_max); | 208 | remaining, lport->lso_max); |