PERFORCE change 173614 for review

[Alexander Motin]

http://p4web.freebsd.org/chv.cgi?CH=173614

Change 173614 by mav at mav_mavtest on 2010/01/24 11:06:25

	Use default number of retries. SCSI devices could return several
	consecutive errors even when functioning correctly.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#37 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#37 (text+ko) ====

@@ -1465,7 +1465,7 @@
 			bioq_remove(&softc->bio_queue, bp);
 
 			scsi_read_write(&start_ccb->csio,
-					/*retries*/cd_retry_count,
+					/*retries*/ cd_retry_count,
 					/* cbfcnp */ cddone,
 					MSG_SIMPLE_Q_TAG,
 					/* read */bp->bio_cmd == BIO_READ,
@@ -1516,7 +1516,7 @@
 		}
 		csio = &start_ccb->csio;
 		scsi_read_capacity(csio,
-				   /*retries*/1,
+				   /*retries*/ cd_retry_count,
 				   cddone,
 				   MSG_SIMPLE_Q_TAG,
 				   rcap,
@@ -2733,7 +2733,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_prevent(&ccb->csio, 
-		     /*retries*/ 1,
+		     /*retries*/ cd_retry_count,
 		     cddone,
 		     MSG_SIMPLE_Q_TAG,
 		     action,
@@ -2911,7 +2911,7 @@
 		return (ENOMEM);
 
 	scsi_read_capacity(&ccb->csio, 
-			   /*retries*/ 1,
+			   /*retries*/ cd_retry_count,
 			   cddone,
 			   MSG_SIMPLE_Q_TAG,
 			   rcap_buf,
@@ -3159,7 +3159,7 @@
 	csio = &ccb->csio;
 
 	cam_fill_csio(csio, 
-		      /* retries */ 1, 
+		      /* retries */ cd_retry_count, 
 		      /* cbfcnp */ cddone, 
 		      /* flags */ CAM_DIR_IN,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3206,7 +3206,7 @@
 	csio = &ccb->csio;
 
 	cam_fill_csio(csio, 
-		      /* retries */ 1, 
+		      /* retries */ cd_retry_count, 
 		      /* cbfcnp */ cddone, 
 		      /* flags */ CAM_DIR_IN,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3267,7 +3267,7 @@
 	param_len = min(param_len, data->alloc_len);
 
 	scsi_mode_sense_len(csio,
-			    /* retries */ 1,
+			    /* retries */ cd_retry_count,
 			    /* cbfcnp */ cddone,
 			    /* tag_action */ MSG_SIMPLE_Q_TAG,
 			    /* dbd */ 0,
@@ -3410,7 +3410,7 @@
 	param_len = min(param_len, data->alloc_len);
 
 	scsi_mode_select_len(csio,
-			     /* retries */ 1,
+			     /* retries */ cd_retry_count,
 			     /* cbfcnp */ cddone,
 			     /* tag_action */ MSG_SIMPLE_Q_TAG,
 			     /* scsi_page_fmt */ 1,
@@ -3472,7 +3472,7 @@
 		cdb_len = sizeof(*scsi_cmd);
 	}
 	cam_fill_csio(csio,
-		      /*retries*/2,
+		      /*retries*/ cd_retry_count,
 		      cddone,
 		      /*flags*/CAM_DIR_NONE,
 		      MSG_SIMPLE_Q_TAG,
@@ -3506,7 +3506,7 @@
 	csio = &ccb->csio;
 
 	cam_fill_csio(csio, 
-		      /* retries */ 1, 
+		      /* retries */ cd_retry_count, 
 		      /* cbfcnp */ cddone, 
 		      /* flags */ CAM_DIR_NONE,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3552,7 +3552,7 @@
 	csio = &ccb->csio;
 
 	cam_fill_csio(csio, 
-		      /* retries */ 1, 
+		      /* retries */ cd_retry_count, 
 		      /* cbfcnp */ cddone, 
 		      /* flags */ CAM_DIR_NONE,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3594,7 +3594,7 @@
 	csio = &ccb->csio;
 
 	cam_fill_csio(csio, 
-		      /* retries */ 1, 
+		      /* retries */ cd_retry_count, 
 		      /* cbfcnp */ cddone, 
 		      /* flags */ CAM_DIR_NONE,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3629,7 +3629,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_start_stop(&ccb->csio,
-			/* retries */ 1,
+			/* retries */ cd_retry_count,
 			/* cbfcnp */ cddone,
 			/* tag_action */ MSG_SIMPLE_Q_TAG,
 			/* start */ TRUE,
@@ -3657,7 +3657,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_start_stop(&ccb->csio,
-			/* retries */ 1,
+			/* retries */ cd_retry_count,
 			/* cbfcnp */ cddone,
 			/* tag_action */ MSG_SIMPLE_Q_TAG,
 			/* start */ FALSE,
@@ -3693,7 +3693,7 @@
 		wrspeed *= 177;
 
 	cam_fill_csio(csio,
-		      /* retries */ 1,
+		      /* retries */ cd_retry_count,
 		      /* cbfcnp */ cddone,
 		      /* flags */ CAM_DIR_NONE,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
@@ -3768,7 +3768,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_report_key(&ccb->csio,
-			/* retries */ 1,
+			/* retries */ cd_retry_count,
 			/* cbfcnp */ cddone,
 			/* tag_action */ MSG_SIMPLE_Q_TAG,
 			/* lba */ lba,
@@ -3946,7 +3946,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_send_key(&ccb->csio,
-		      /* retries */ 1,
+		      /* retries */ cd_retry_count,
 		      /* cbfcnp */ cddone,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
 		      /* agid */ authinfo->agid,
@@ -4050,7 +4050,7 @@
 	ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
 
 	scsi_read_dvd_structure(&ccb->csio,
-				/* retries */ 1,
+				/* retries */ cd_retry_count,
 				/* cbfcnp */ cddone,
 				/* tag_action */ MSG_SIMPLE_Q_TAG,
 				/* lba */ address,