]> git.karo-electronics.de Git - linux-beck.git/commitdiff
be2iscsi: Added return value check for mgmt_get_all_if_id
authorJitendra Bhivare <jitendra.bhivare@avagotech.com>
Wed, 20 Jan 2016 08:40:50 +0000 (14:10 +0530)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 24 Feb 2016 02:27:02 +0000 (21:27 -0500)
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>
drivers/scsi/be2iscsi/be_iscsi.c
drivers/scsi/be2iscsi/be_mgmt.c

index 022e87b62e401a37e1d6578e065f389ce560a8b4..337ddc76b877b0ac2e8049aa44d5de62d2c4b339 100644 (file)
@@ -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) {
index 7f3f8268770369fc0d9a8ba92ff0a5baedd5a1d0..7aa7a3c311e30dc82362781104c5c2d77da49393 100644 (file)
@@ -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,