Attachment 136582 Details for Bug 181836 – fix_freebsd.diff

[patch] fix_freebsd.diff

fix_freebsd.diff (text/x-patch), 1.21 KB, created by Oleksii Samorukov on 2013-11-15 23:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksii Samorukov

Created: 2013-11-15 23:07:25 UTC

Size: 1.21 KB

patch

obsolete

>Index: os_freebsd.cpp
>===================================================================
>--- os_freebsd.cpp	(revision 3857)
>+++ os_freebsd.cpp	(revision 3858)
>@@ -445,7 +445,8 @@
>   }
> 
>   if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
>-    cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
>+    if(scsi_debugmode > 0)
>+      cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
>     set_err(EIO);
>     return -1;
>   }
>@@ -997,13 +998,15 @@
> 
>   if (cam_send_ccb(m_camdev,ccb) < 0) {
>     warn("error sending SCSI ccb");
>-    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>+    if (report > 0)
>+      cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>     cam_freeccb(ccb);
>     return -EIO;
>   }
> 
>-  if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
>-    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>+  if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR)) {
>+    if(report > 0)
>+      cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>     cam_freeccb(ccb);
>     return -EIO;
>   }

Actions: View | Diff

Attachments on bug 181836: 136582 | 136583