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

[SCSI] qla2xxx: Check for a match before attempting to set FCP-priority information.

Browse Source 
Modifying qla24xx_get_fcp_prio() to return a 'found' status
allows the driver to short circuit the 'set FCP-priority' call
and reduce the amount of noise generated in the messages file:

	scsi(5): Unable to activate fcp priority,  ret=0x102
	scsi(5): Unable to activate fcp priority,  ret=0x102

Also make qla24xx_get_fcp_prio() static.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Andrew Vasquez 2011-03-30 11:46:18 -07:00 committed by James Bottomley
parent 80d79440ad
commit f28a0a9613
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/qla2xxx/qla_init.c
View File

@ -5508,26 +5508,26 @@ qla81xx_update_fw_options(scsi_qla_host_t *vha)
* *
* Return: * Return:
* non-zero (if found) * non-zero (if found)
* 0 (if not found) * -1 (if not found)
* *
* Context: * Context:
* Kernel context * Kernel context
*/ */
uint8_t static int
qla24xx_get_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport) qla24xx_get_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport)
{ {
int i, entries; int i, entries;
uint8_t pid_match, wwn_match; uint8_t pid_match, wwn_match;
uint8_t priority; int priority;
uint32_t pid1, pid2; uint32_t pid1, pid2;
uint64_t wwn1, wwn2; uint64_t wwn1, wwn2;
struct qla_fcp_prio_entry *pri_entry; struct qla_fcp_prio_entry *pri_entry;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
if (!ha->fcp_prio_cfg || !ha->flags.fcp_prio_enabled) if (!ha->fcp_prio_cfg || !ha->flags.fcp_prio_enabled)
return 0; return -1;
priority = 0; priority = -1;
entries = ha->fcp_prio_cfg->num_entries; entries = ha->fcp_prio_cfg->num_entries;
pri_entry = &ha->fcp_prio_cfg->entry[0]; pri_entry = &ha->fcp_prio_cfg->entry[0];
@ -5610,7 +5610,7 @@ int
qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport) qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport)
{ {
int ret; int ret;
uint8_t priority; int priority;
uint16_t mb[5]; uint16_t mb[5];
if (fcport->port_type != FCT_TARGET || if (fcport->port_type != FCT_TARGET ||
@ -5618,6 +5618,9 @@ qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport)
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
priority = qla24xx_get_fcp_prio(vha, fcport); priority = qla24xx_get_fcp_prio(vha, fcport);
if (priority < 0)
return QLA_FUNCTION_FAILED;
ret = qla24xx_set_fcp_prio(vha, fcport->loop_id, priority, mb); ret = qla24xx_set_fcp_prio(vha, fcport->loop_id, priority, mb);
if (ret == QLA_SUCCESS) if (ret == QLA_SUCCESS)
fcport->fcp_prio = priority; fcport->fcp_prio = priority;