svn commit: r221585 - head/sys/cam/scsi

Andriy Gapon avg at FreeBSD.org
Sat May 7 10:06:43 UTC 2011


Author: avg
Date: Sat May  7 10:06:43 2011
New Revision: 221585
URL: http://svn.freebsd.org/changeset/base/221585

Log:
  scsi_cd: silence READ_TOC errors in CDIOREADTOCHEADER ioctl
  
  An optical disk may not have a TOC (e.g. for blank media) and userland
  software may legitimately try to use CDIOREADTOCHEADER to find out about
  the TOC.
  
  Silence from:	scsi@
  MFC after:	10 days

Modified:
  head/sys/cam/scsi/scsi_cd.c

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Sat May  7 09:33:37 2011	(r221584)
+++ head/sys/cam/scsi/scsi_cd.c	Sat May  7 10:06:43 2011	(r221585)
@@ -2138,7 +2138,7 @@ cdioctl(struct disk *dp, u_long cmd, voi
 				  ("trying to do CDIOREADTOCHEADER\n"));
 
 			error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, 
-				          sizeof (*th), /*sense_flags*/0);
+				          sizeof (*th), /*sense_flags*/SF_NO_PRINT);
 			if (error) {
 				free(th, M_SCSICD);
 				cam_periph_unlock(periph);


More information about the svn-src-head mailing list