Merge branch 'coverity' of https://github.com/hreinecke/multipath-tools
authorChristophe Varoqui <christophe.varoqui@opensvc.com>
Mon, 20 Jun 2016 06:44:01 +0000 (08:44 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Mon, 20 Jun 2016 06:44:01 +0000 (08:44 +0200)
1  2 
kpartx/gpt.c
kpartx/lopart.c
libmpathpersist/mpath_persist.c
libmpathpersist/mpath_pr_ioctl.c
libmultipath/prioritizers/alua_rtpg.c
libmultipath/prioritizers/hds.c
libmultipath/prioritizers/iet.c
multipathd/main.c

diff --cc kpartx/gpt.c
Simple merge
diff --cc kpartx/lopart.c
Simple merge
Simple merge
@@@ -398,19 -399,18 +399,18 @@@ out
        return status;
  }
  
- int mpath_translate_response (char * dev, struct sg_io_hdr io_hdr, SenseData_t Sensedata, int noisy)
+ int mpath_translate_response (char * dev, struct sg_io_hdr io_hdr,
+                             SenseData_t *Sensedata, int noisy)
  {
        condlog(3, "%s: status driver:%02x host:%02x scsi:%02x", dev,
 -              io_hdr.driver_status, io_hdr.host_status, io_hdr.status);
 +                      io_hdr.driver_status, io_hdr.host_status ,io_hdr.status);
        io_hdr.status &= 0x7e;
-       if ((0 == io_hdr.status) && (0 == io_hdr.host_status) &&
-                       (0 == io_hdr.driver_status))
-       {
+       if ((0 == io_hdr.status) &&
+           (0 == io_hdr.host_status) &&
+           (0 == io_hdr.driver_status))
                return MPATH_PR_SUCCESS;
-       }
  
-       switch(io_hdr.status)
-       {
+       switch(io_hdr.status) {
                case SAM_STAT_GOOD:
                        break;
                case SAM_STAT_CHECK_CONDITION:
Simple merge
Simple merge
Simple merge
Simple merge