iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qla_target: improve qlt_unmap_sg()

Browse Source 
Remove the inline attribute.  Modern compilers ignore it and the
function has grown beyond where inline made sense anyway.
Remove the BUG_ON(!cmd->sg_mapped), and instead return if sg_mapped is
not set.  Every caller is doing this check, so we might as well have it
in one place instead of four.

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Joern Engel 2014-09-16 16:23:18 -04:00 committed by Nicholas Bellinger
parent 55a9066fff
commit f9b6721a9c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/qla2xxx/qla_target.c
View File

@ -1409,12 +1409,13 @@ out_err:
return -1; return -1;
} }
static inline void qlt_unmap_sg(struct scsi_qla_host *vha, static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)
struct qla_tgt_cmd *cmd)
{ {
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
BUG_ON(!cmd->sg_mapped); if (!cmd->sg_mapped)
return;
pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction); pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
cmd->sg_mapped = 0; cmd->sg_mapped = 0;
@ -2403,8 +2404,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
return 0; return 0;
out_unmap_unlock: out_unmap_unlock:
if (cmd->sg_mapped) qlt_unmap_sg(vha, cmd);
qlt_unmap_sg(vha, cmd);
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
return res; return res;
@ -2468,8 +2468,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
return res; return res;
out_unlock_free_unmap: out_unlock_free_unmap:
if (cmd->sg_mapped) qlt_unmap_sg(vha, cmd);
qlt_unmap_sg(vha, cmd);
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
return res; return res;
@ -2706,8 +2705,7 @@ done:
if (!ha_locked && !in_interrupt()) if (!ha_locked && !in_interrupt())
msleep(250); /* just in case */ msleep(250); /* just in case */
if (cmd->sg_mapped) qlt_unmap_sg(vha, cmd);
qlt_unmap_sg(vha, cmd);
vha->hw->tgt.tgt_ops->free_cmd(cmd); vha->hw->tgt.tgt_ops->free_cmd(cmd);
} }
return; return;
@ -2927,8 +2925,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
se_cmd = &cmd->se_cmd; se_cmd = &cmd->se_cmd;
tfo = se_cmd->se_tfo; tfo = se_cmd->se_tfo;
if (cmd->sg_mapped) qlt_unmap_sg(vha, cmd);
qlt_unmap_sg(vha, cmd);
if (unlikely(status != CTIO_SUCCESS)) { if (unlikely(status != CTIO_SUCCESS)) {
switch (status & 0xFFFF) { switch (status & 0xFFFF) {