Re: [PATCH] some sd.c code consolidation

[James Bottomley <James.Bottomley@steeleye.com>]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

On Mon, 2003-06-09 at 11:24, Christoph Hellwig wrote:
> fold sd_init_onedisk into sd_revalidate_disk and sd_synchronize_cache
> into sd_shutdown.

You didn't actually boot this one, did you?  There's a use before
initialise of gendisk->private_data in sd_revalidate_disk().

James



[-- Attachment #2: tmp.diff --]
[-- Type: text/plain, Size: 557 bytes --]

===== drivers/scsi/sd.c 1.120 vs edited =====
--- 1.120/drivers/scsi/sd.c	Sun Jun  8 15:33:57 2003
+++ edited/drivers/scsi/sd.c	Wed Jun 11 18:59:49 2003
@@ -1340,13 +1340,14 @@
 
 	strcpy(gd->devfs_name, sdp->devfs_name);
 
+	gd->private_data = &sdkp->driver;
+
 	sd_revalidate_disk(gd);
 
 	gd->driverfs_dev = &sdp->sdev_driverfs_dev;
 	gd->flags = GENHD_FL_DRIVERFS;
 	if (sdp->removable)
 		gd->flags |= GENHD_FL_REMOVABLE;
-	gd->private_data = &sdkp->driver;
 	gd->queue = sdkp->device->request_queue;
 
 	dev_set_drvdata(dev, sdkp);