From owner-svn-src-all@FreeBSD.ORG  Sat May  7 10:06:43 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CFD0106564A;
	Sat,  7 May 2011 10:06:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D6838FC0A;
	Sat,  7 May 2011 10:06:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p47A6hUr091781;
	Sat, 7 May 2011 10:06:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47A6hak091779;
	Sat, 7 May 2011 10:06:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201105071006.p47A6hak091779@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 7 May 2011 10:06:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221585 - head/sys/cam/scsi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 May 2011 10:06:43 -0000

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);