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

[SCSI] be2iscsi: Fix return value and typo.

Browse Source 
Fix return value and typo in the message displayed.
Fix the goto label when wrb_hanlde allocation fails.
Fix the error message display in beiscsi_alloc_pdu

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
John Soni Jose 2012-10-20 04:43:03 +05:30 committed by James Bottomley
parent 72fb46a9d5
commit 8359c79b3b
2 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/be2iscsi/be_iscsi.c
View File

@ -531,9 +531,9 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
break; break;
case ISCSI_NET_PARAM_IPV4_BOOTPROTO: case ISCSI_NET_PARAM_IPV4_BOOTPROTO:
if (!if_info.dhcp_state) if (!if_info.dhcp_state)
len = sprintf(buf, "static"); len = sprintf(buf, "static\n");
else else
len = sprintf(buf, "dhcp"); len = sprintf(buf, "dhcp\n");
break; break;
case ISCSI_NET_PARAM_IPV4_SUBNET: case ISCSI_NET_PARAM_IPV4_SUBNET:
len = sprintf(buf, "%pI4\n", &if_info.ip_addr.subnet_mask); len = sprintf(buf, "%pI4\n", &if_info.ip_addr.subnet_mask);
@ -541,7 +541,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
case ISCSI_NET_PARAM_VLAN_ENABLED: case ISCSI_NET_PARAM_VLAN_ENABLED:
len = sprintf(buf, "%s\n", len = sprintf(buf, "%s\n",
(if_info.vlan_priority == BEISCSI_VLAN_DISABLE) (if_info.vlan_priority == BEISCSI_VLAN_DISABLE)
? "Disabled" : "Enabled"); ? "Disabled\n" : "Enabled\n");
break; break;
case ISCSI_NET_PARAM_VLAN_ID: case ISCSI_NET_PARAM_VLAN_ID:
if (if_info.vlan_priority == BEISCSI_VLAN_DISABLE) if (if_info.vlan_priority == BEISCSI_VLAN_DISABLE)
@ -586,7 +586,7 @@ int be2iscsi_iface_get_param(struct iscsi_iface *iface,
len = be2iscsi_get_if_param(phba, iface, param, buf); len = be2iscsi_get_if_param(phba, iface, param, buf);
break; break;
case ISCSI_NET_PARAM_IFACE_ENABLE: case ISCSI_NET_PARAM_IFACE_ENABLE:
len = sprintf(buf, "enabled"); len = sprintf(buf, "enabled\n");
break; break;
case ISCSI_NET_PARAM_IPV4_GW: case ISCSI_NET_PARAM_IPV4_GW:
memset(&gateway, 0, sizeof(gateway)); memset(&gateway, 0, sizeof(gateway));
@ -731,7 +731,6 @@ static int beiscsi_get_initname(char *buf, struct beiscsi_hba *phba)
* beiscsi_get_port_state - Get the Port State * beiscsi_get_port_state - Get the Port State
* @shost : pointer to scsi_host structure * @shost : pointer to scsi_host structure
* *
* returns number of bytes
*/ */
static void beiscsi_get_port_state(struct Scsi_Host *shost) static void beiscsi_get_port_state(struct Scsi_Host *shost)
{ {
@ -1150,8 +1149,8 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
if (phba->state != BE_ADAPTER_UP) { if (phba->state != BE_ADAPTER_UP) {
ret = -EBUSY; ret = -EBUSY;
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG,
"BS_%d : The Adapter state is Not UP\n"); "BS_%d : The Adapter Port state is Down!!!\n");
return ERR_PTR(ret); return ERR_PTR(ret);
} }

67
drivers/scsi/be2iscsi/be_main.c
View File

@ -4105,13 +4105,25 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
spin_lock(&phba->io_sgl_lock); spin_lock(&phba->io_sgl_lock);
io_task->psgl_handle = alloc_io_sgl_handle(phba); io_task->psgl_handle = alloc_io_sgl_handle(phba);
spin_unlock(&phba->io_sgl_lock); spin_unlock(&phba->io_sgl_lock);
if (!io_task->psgl_handle) if (!io_task->psgl_handle) {
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of IO_SGL_ICD Failed"
"for the CID : %d\n",
beiscsi_conn->beiscsi_conn_cid);
goto free_hndls; goto free_hndls;
}
io_task->pwrb_handle = alloc_wrb_handle(phba, io_task->pwrb_handle = alloc_wrb_handle(phba,
beiscsi_conn->beiscsi_conn_cid - beiscsi_conn->beiscsi_conn_cid -
phba->fw_config.iscsi_cid_start); phba->fw_config.iscsi_cid_start);
if (!io_task->pwrb_handle) if (!io_task->pwrb_handle) {
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of WRB_HANDLE Failed"
"for the CID : %d\n",
beiscsi_conn->beiscsi_conn_cid);
goto free_io_hndls; goto free_io_hndls;
}
} else { } else {
io_task->scsi_cmnd = NULL; io_task->scsi_cmnd = NULL;
if ((opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN) { if ((opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN) {
@ -4120,8 +4132,16 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
io_task->psgl_handle = (struct sgl_handle *) io_task->psgl_handle = (struct sgl_handle *)
alloc_mgmt_sgl_handle(phba); alloc_mgmt_sgl_handle(phba);
spin_unlock(&phba->mgmt_sgl_lock); spin_unlock(&phba->mgmt_sgl_lock);
if (!io_task->psgl_handle) if (!io_task->psgl_handle) {
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO |
BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of MGMT_SGL_ICD Failed"
"for the CID : %d\n",
beiscsi_conn->
beiscsi_conn_cid);
goto free_hndls; goto free_hndls;
}
beiscsi_conn->login_in_progress = 1; beiscsi_conn->login_in_progress = 1;
beiscsi_conn->plogin_sgl_handle = beiscsi_conn->plogin_sgl_handle =
@ -4130,8 +4150,16 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
alloc_wrb_handle(phba, alloc_wrb_handle(phba,
beiscsi_conn->beiscsi_conn_cid - beiscsi_conn->beiscsi_conn_cid -
phba->fw_config.iscsi_cid_start); phba->fw_config.iscsi_cid_start);
if (!io_task->pwrb_handle) if (!io_task->pwrb_handle) {
goto free_io_hndls; beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO |
BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of WRB_HANDLE Failed"
"for the CID : %d\n",
beiscsi_conn->
beiscsi_conn_cid);
goto free_mgmt_hndls;
}
beiscsi_conn->plogin_wrb_handle = beiscsi_conn->plogin_wrb_handle =
io_task->pwrb_handle; io_task->pwrb_handle;
@ -4146,14 +4174,28 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
spin_lock(&phba->mgmt_sgl_lock); spin_lock(&phba->mgmt_sgl_lock);
io_task->psgl_handle = alloc_mgmt_sgl_handle(phba); io_task->psgl_handle = alloc_mgmt_sgl_handle(phba);
spin_unlock(&phba->mgmt_sgl_lock); spin_unlock(&phba->mgmt_sgl_lock);
if (!io_task->psgl_handle) if (!io_task->psgl_handle) {
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO |
BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of MGMT_SGL_ICD Failed"
"for the CID : %d\n",
beiscsi_conn->
beiscsi_conn_cid);
goto free_hndls; goto free_hndls;
}
io_task->pwrb_handle = io_task->pwrb_handle =
alloc_wrb_handle(phba, alloc_wrb_handle(phba,
beiscsi_conn->beiscsi_conn_cid - beiscsi_conn->beiscsi_conn_cid -
phba->fw_config.iscsi_cid_start); phba->fw_config.iscsi_cid_start);
if (!io_task->pwrb_handle) if (!io_task->pwrb_handle) {
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of WRB_HANDLE Failed"
"for the CID : %d\n",
beiscsi_conn->beiscsi_conn_cid);
goto free_mgmt_hndls; goto free_mgmt_hndls;
}
} }
} }
@ -4185,9 +4227,6 @@ free_hndls:
pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs, pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
io_task->bhs_pa.u.a64.address); io_task->bhs_pa.u.a64.address);
io_task->cmd_bhs = NULL; io_task->cmd_bhs = NULL;
beiscsi_log(phba, KERN_ERR,
BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,
"BM_%d : Alloc of SGL_ICD Failed\n");
return -ENOMEM; return -ENOMEM;
} }
@ -4387,13 +4426,13 @@ static int beiscsi_bsg_request(struct bsg_job *job)
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
"BM_%d : Failed to allocate memory for " "BM_%d : Failed to allocate memory for "
"beiscsi_bsg_request\n"); "beiscsi_bsg_request\n");
return -EIO; return -ENOMEM;
} }
tag = mgmt_vendor_specific_fw_cmd(&phba->ctrl, phba, job, tag = mgmt_vendor_specific_fw_cmd(&phba->ctrl, phba, job,
&nonemb_cmd); &nonemb_cmd);
if (!tag) { if (!tag) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
"BM_%d : be_cmd_get_mac_addr Failed\n"); "BM_%d : MBX Tag Allocation Failed\n");
pci_free_consistent(phba->ctrl.pdev, nonemb_cmd.size, pci_free_consistent(phba->ctrl.pdev, nonemb_cmd.size,
nonemb_cmd.va, nonemb_cmd.dma); nonemb_cmd.va, nonemb_cmd.dma);
@ -4417,11 +4456,13 @@ static int beiscsi_bsg_request(struct bsg_job *job)
nonemb_cmd.va, nonemb_cmd.dma); nonemb_cmd.va, nonemb_cmd.dma);
if (status || extd_status) { if (status || extd_status) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
"BM_%d : be_cmd_get_mac_addr Failed" "BM_%d : MBX Cmd Failed"
" status = %d extd_status = %d\n", " status = %d extd_status = %d\n",
status, extd_status); status, extd_status);
return -EIO; return -EIO;
} else {
rc = 0;
} }
break; break;