From f4013c3879d1bbd9f3ab8351185decd049502368 Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Tue, 28 Dec 2010 16:20:47 +0100 Subject: [PATCH] [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event SDEV_MEDIA_CHANGE event was first added by commit a341cd0f (SCSI: add asynchronous event notification API) for SATA AN support and then extended to cover generic media change events by commit 285e9670 ([SCSI] sr,sd: send media state change modification events). This event was mapped to block device in userland with all properties stripped to simulate CHANGE event on the block device, which, in turn, was used to trigger further userspace action on media change. The recent addition of disk event framework kept this event for backward compatibility but it turns out to be unnecessary and causes erratic and inefficient behavior. The new disk event generates proper events on the block devices and the compat events are mapped to block device with all properties stripped, so the block device ends up generating multiple duplicate events for single actual event. This patch removes the compat event generation from both sr and sd as suggested by Kay Sievers. Both existing and newer versions of udev and the associated tools will behave better with the removal of these events as they from the beginning were expecting events on the block devices. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de> --- drivers/scsi/sd.c | 5 ----- drivers/scsi/sr.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7d257465bd982..e56730214c05e 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1086,13 +1086,8 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) * * Medium present state has changed in either direction. * Device has indicated UNIT_ATTENTION. - * - * Report SDEV_EVT_MEDIA_CHANGE too for backward compatibility. */ - if (sdp->changed) - sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL); kfree(sshdr); - retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0; sdp->changed = 0; return retval; diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index be6baf8ad7043..aefadc6a16072 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -249,10 +249,6 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi, cd->device->changed = 0; } - /* for backward compatibility */ - if (events & DISK_EVENT_MEDIA_CHANGE) - sdev_evt_send_simple(cd->device, SDEV_EVT_MEDIA_CHANGE, - GFP_KERNEL); return events; } -- GitLab