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

[Matt Jacob]

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