diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-16 17:52:17 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 17:53:39 +0100 |
| commit | 93aae17af1172c40c6f74b7294e93a90c3cfaa5d (patch) | |
| tree | 1ad359eba862b56c106bca78d412293f34e3500d /drivers/scsi/sr.h | |
| parent | 9f8a2c23c6c1140f515f601265c4dff7522110b7 (diff) | |
| download | op-kernel-dev-93aae17af1172c40c6f74b7294e93a90c3cfaa5d.zip op-kernel-dev-93aae17af1172c40c6f74b7294e93a90c3cfaa5d.tar.gz | |
sr: implement sr_check_events()
Replace sr_media_change() with sr_check_events(). It normally only
uses GET_EVENT_STATUS_NOTIFICATION to check both media change and
eject request. If @clearing includes DISK_EVENT_MEDIA_CHANGE, it
issues TUR and compares whether media presence has changed. The SCSI
specific media change uevent is kept for compatibility.
sr_media_change() was doing both media change check and revalidation.
The revalidation part is split into sr_block_revalidate_disk().
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/scsi/sr.h')
| -rw-r--r-- | drivers/scsi/sr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h index 81fbc0b..e036f1d 100644 --- a/drivers/scsi/sr.h +++ b/drivers/scsi/sr.h @@ -40,7 +40,7 @@ typedef struct scsi_cd { unsigned xa_flag:1; /* CD has XA sectors ? */ unsigned readcd_known:1; /* drive supports READ_CD (0xbe) */ unsigned readcd_cdda:1; /* reading audio data using READ_CD */ - unsigned previous_state:1; /* media has changed */ + unsigned media_present:1; /* media is present */ 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 */ |
