Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 May 2011 10:06:43 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r221585 - head/sys/cam/scsi
Message-ID:  <201105071006.p47A6hak091779@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105071006.p47A6hak091779>