Re: 2.6.5-mm2

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

On Wed, 2004-04-07 at 02:10, Andrew Morton wrote:
> It looks like Mr SCSI forgot to commit his changes to sr.h.

Hmm, I seem to be having a lot of source control fiasco's recently.

The attached is the missing header patch (which I've also put in
scsi-misc-2.6)

James

===== drivers/scsi/sr.h 1.10 vs edited =====
--- 1.10/drivers/scsi/sr.h	Mon May 26 04:50:43 2003
+++ edited/drivers/scsi/sr.h	Mon Apr  5 15:51:37 2004
@@ -36,6 +36,9 @@
 	unsigned readcd_known:1;	/* drive supports READ_CD (0xbe) */
 	unsigned readcd_cdda:1;	/* reading audio data using READ_CD */
 	struct cdrom_device_info cdi;
+	/* We hold gendisk and scsi_device references on probe and use
+	 * the refs on this kobj to decide when to release them */
+	struct kobject kobj;
 	struct gendisk *disk;
 } Scsi_CD;