Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...

[~andy/linux] / drivers / scsi / sr.h

diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index e036f1dc83c868f56d4ba5d0b5b687100119b710..37c8f6b175102aa59999ea9a544aadfcb4902ac5 100644 (file)
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -41,6 +41,13 @@ typedef struct scsi_cd {
        unsigned readcd_known:1;        /* drive supports READ_CD (0xbe) */
        unsigned readcd_cdda:1; /* reading audio data using READ_CD */
        unsigned media_present:1;       /* media is present */
+
+       /* GET_EVENT spurious event handling, blk layer guarantees exclusion */
+       int tur_mismatch;               /* nr of get_event TUR mismatches */
+       bool tur_changed:1;             /* changed according to TUR */
+       bool get_event_changed:1;       /* changed according to GET_EVENT */
+       bool ignore_get_event:1;        /* GET_EVENT is unreliable, use TUR */
+
        struct cdrom_device_info cdi;
        /* We hold gendisk and scsi_device references on probe and use
         * the refs on this kref to decide when to release them */