From owner-svn-src-all@FreeBSD.ORG  Sat Jul 14 02:59:12 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7AAE5106566B;
	Sat, 14 Jul 2012 02:59:12 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 66A6E8FC08;
	Sat, 14 Jul 2012 02:59:12 +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 q6E2xCuL004526;
	Sat, 14 Jul 2012 02:59:12 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6E2xCX4004524;
	Sat, 14 Jul 2012 02:59:12 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201207140259.q6E2xCX4004524@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sat, 14 Jul 2012 02:59:12 +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: r238437 - 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, 14 Jul 2012 02:59:12 -0000

Author: mjacob
Date: Sat Jul 14 02:59:11 2012
New Revision: 238437
URL: http://svn.freebsd.org/changeset/base/238437

Log:
  The call to disk_resize causes a panic if DIAGNOSTIC is set.
  Coping with that while the finest minds of our generation
  figure out why.

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

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Sat Jul 14 02:52:48 2012	(r238436)
+++ head/sys/cam/scsi/scsi_da.c	Sat Jul 14 02:59:11 2012	(r238437)
@@ -2645,7 +2645,10 @@ dasetgeom(struct cam_periph *periph, uin
 	else
 		softc->disk->d_flags &= ~DISKFLAG_CANDELETE;
 
+/* Currently as of 6/13/2012, panics if DIAGNOSTIC is set */
+#ifndef	DIAGNOSTIC
 	disk_resize(softc->disk);
+#endif
 }
 
 static void