[patch 6/7] SCSI: save disk in scsi_device
DORMANTno replies
From: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Date: 2007-05-09 23:43:41
Also in:
linux-scsi, lkml
Give anyone who has access to scsi_device access to the genhd struct as well. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Index: 2.6-git/drivers/scsi/sd.c ===================================================================
--- 2.6-git.orig/drivers/scsi/sd.c
+++ 2.6-git/drivers/scsi/sd.c@@ -1673,6 +1673,7 @@ static int sd_probe(struct device *dev) dev_set_drvdata(dev, sdkp); add_disk(gd); + sdp->disk = gd; sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", sdp->removable ? "removable " : "");
Index: 2.6-git/drivers/scsi/sr.c ===================================================================
--- 2.6-git.orig/drivers/scsi/sr.c
+++ 2.6-git/drivers/scsi/sr.c@@ -606,6 +606,7 @@ static int sr_probe(struct device *dev) if (sdev->media_change_notify) disk->flags |= GENHD_FL_MEDIA_CHANGE_NOTIFY; add_disk(disk); + sdev->disk = disk; sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name);
Index: 2.6-git/include/scsi/scsi_device.h ===================================================================
--- 2.6-git.orig/include/scsi/scsi_device.h
+++ 2.6-git/include/scsi/scsi_device.h@@ -140,7 +140,7 @@ struct scsi_device { struct device sdev_gendev; struct class_device sdev_classdev; - + struct gendisk *disk; struct execute_work ew; /* used to get process context on put */ enum scsi_device_state sdev_state;
--