From owner-freebsd-bugs@FreeBSD.ORG  Thu Apr 15 08:30:03 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B36FD1065686
	for <freebsd-bugs@hub.freebsd.org>;
	Thu, 15 Apr 2010 08:30:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 894AB8FC22
	for <freebsd-bugs@hub.freebsd.org>;
	Thu, 15 Apr 2010 08:30:03 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o3F8U3qh024431
	for <freebsd-bugs@freefall.freebsd.org>; Thu, 15 Apr 2010 08:30:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o3F8U3RS024420;
	Thu, 15 Apr 2010 08:30:03 GMT (envelope-from gnats)
Date: Thu, 15 Apr 2010 08:30:03 GMT
Message-Id: <201004150830.o3F8U3RS024420@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/145385: commit references a PR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Apr 2010 08:30:03 -0000

The following reply was made to PR kern/145385; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/145385: commit references a PR
Date: Thu, 15 Apr 2010 08:29:23 +0000 (UTC)

 Author: avg
 Date: Thu Apr 15 08:29:14 2010
 New Revision: 206648
 URL: http://svn.freebsd.org/changeset/base/206648
 
 Log:
   scsi_cd: CD_FLAG_VALID_MEDIA is sufficient to set d_sectorsize and
   d_mediasize
   
   CD_FLAG_VALID_TOC is not required for setting those media properties.
   
   PR:		kern/145385
   Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de>
   		a slightly different version
   Tested by:	Pavel Sukhoy <sukhoy@ripn.net>,
   		Markus Wild <m.wild@cybernet.ch>,
   		Juergen Lock <nox@jelal.kn-bremen.de>,
   		uqs
   MFC after:	1 week
 
 Modified:
   head/sys/cam/scsi/scsi_cd.c
 
 Modified: head/sys/cam/scsi/scsi_cd.c
 ==============================================================================
 --- head/sys/cam/scsi/scsi_cd.c	Thu Apr 15 08:20:57 2010	(r206647)
 +++ head/sys/cam/scsi/scsi_cd.c	Thu Apr 15 08:29:14 2010	(r206648)
 @@ -2773,8 +2773,12 @@ cdcheckmedia(struct cam_periph *periph)
  		softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC);
  		cdprevent(periph, PR_ALLOW);
  		return (error);
 -	} else
 +	} else {
  		softc->flags |= CD_FLAG_VALID_MEDIA;
 +		softc->disk->d_sectorsize = softc->params.blksize;
 +		softc->disk->d_mediasize =
 +		    (off_t)softc->params.blksize * softc->params.disksize;
 +	}
  
  	/*
  	 * Now we check the table of contents.  This (currently) is only
 @@ -2863,9 +2867,6 @@ cdcheckmedia(struct cam_periph *periph)
  	}
  
  	softc->flags |= CD_FLAG_VALID_TOC;
 -	softc->disk->d_sectorsize = softc->params.blksize;
 -	softc->disk->d_mediasize =
 -	    (off_t)softc->params.blksize * softc->params.disksize;
  
  bailout:
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"