be2iscsi: Added return value check for mgmt_get_all_if_id

Orabug: 22725588

Use of mutex_lock_interruptible can return -EINTR, handle and log the
error.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@avagotech.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 2f0700796842004812a12c6307487747f2868e63..132902e2a3e06cfe4d2c22bcef8a9c12eec62731 100644 (file)
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -367,13 +367,14 @@ beiscsi_set_vlan_tag(struct Scsi_Host *shost,
                      struct iscsi_iface_param_info *iface_param)
 {
        struct beiscsi_hba *phba = iscsi_host_priv(shost);
-       int ret = 0;
+       int ret;
 
        /* Get the Interface Handle */
-       if (mgmt_get_all_if_id(phba)) {
+       ret = mgmt_get_all_if_id(phba);
+       if (ret) {
                beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
                            "BS_%d : Getting Interface Handle Failed\n");
-               return -EIO;
+               return ret;
        }
 
        switch (iface_param->param) {

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 1df1a789d6d22fa3fffb0ece5edf3ade3ac81d1c..fd0201a651dff61ef39f77fc30fcdf38c6e4481e 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1025,8 +1025,9 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
        uint32_t ip_type;
        int rc;
 
-       if (mgmt_get_all_if_id(phba))
-               return -EIO;
+       rc = mgmt_get_all_if_id(phba);
+       if (rc)
+               return rc;
 
        ip_type = (ip_param->param == ISCSI_NET_PARAM_IPV6_ADDR) ?
                BE2_IPV6 : BE2_IPV4 ;
@@ -1195,8 +1196,9 @@ int mgmt_get_if_info(struct beiscsi_hba *phba, int ip_type,
        uint32_t ioctl_size = sizeof(struct be_cmd_get_if_info_resp);
        int rc;
 
-       if (mgmt_get_all_if_id(phba))
-               return -EIO;
+       rc = mgmt_get_all_if_id(phba);
+       if (rc)
+               return rc;
 
        do {
                rc = mgmt_alloc_cmd_data(phba, &nonemb_cmd,