Author: mav
Date: Mon Nov  8 15:59:41 2010
New Revision: 214989
URL: http://svn.freebsd.org/changeset/base/214989

Log:
  When requesting sense data for SIM not doing it automatically (such as
  ATAPI or USB), request only as much data as requested by consumer.
  On the way back -- report how much sense data we have actually received.

Modified:
  head/sys/cam/cam_periph.c

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c   Mon Nov  8 15:36:15 2010        (r214988)
+++ head/sys/cam/cam_periph.c   Mon Nov  8 15:59:41 2010        (r214989)
@@ -1055,6 +1055,7 @@ camperiphsensedone(struct cam_periph *pe
                        saved_ccb->ccb_h.status |=
                            CAM_AUTOSENSE_FAIL;
                }
+               saved_ccb->csio.sense_resid = done_ccb->csio.resid;
                bcopy(saved_ccb, done_ccb, sizeof(union ccb));
                xpt_free_ccb(saved_ccb);
                break;
@@ -1211,7 +1212,7 @@ camperiphdone(struct cam_periph *periph,
                        scsi_request_sense(&done_ccb->csio, /*retries*/1,
                                           camperiphsensedone,
                                           &save_ccb->csio.sense_data,
-                                          sizeof(save_ccb->csio.sense_data),
+                                          save_ccb->csio.sense_len,
                                           CAM_TAG_ACTION_NONE,
                                           /*sense_len*/SSD_FULL_SIZE,
                                           /*timeout*/5000);
@@ -1602,7 +1603,7 @@ camperiphscsisenseerror(union ccb *ccb, 
                        scsi_request_sense(&ccb->csio, /*retries*/1,
                                           camperiphsensedone,
                                           &orig_ccb->csio.sense_data,
-                                          sizeof(orig_ccb->csio.sense_data),
+                                          orig_ccb->csio.sense_len,
                                           CAM_TAG_ACTION_NONE,
                                           /*sense_len*/SSD_FULL_SIZE,
                                           /*timeout*/5000);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to