Commit f4013c3879d1bbd9f3ab8351185decd049502368

Authored by Tejun Heo
Committed by James Bottomley
1 parent 2bae0093ca

[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>

Showing 2 changed files with 0 additions and 9 deletions Side-by-side Diff

... ... @@ -1086,13 +1086,8 @@
1086 1086 *
1087 1087 * Medium present state has changed in either direction.
1088 1088 * Device has indicated UNIT_ATTENTION.
1089   - *
1090   - * Report SDEV_EVT_MEDIA_CHANGE too for backward compatibility.
1091 1089 */
1092   - if (sdp->changed)
1093   - sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL);
1094 1090 kfree(sshdr);
1095   -
1096 1091 retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
1097 1092 sdp->changed = 0;
1098 1093 return retval;
... ... @@ -249,10 +249,6 @@
249 249 cd->device->changed = 0;
250 250 }
251 251  
252   - /* for backward compatibility */
253   - if (events & DISK_EVENT_MEDIA_CHANGE)
254   - sdev_evt_send_simple(cd->device, SDEV_EVT_MEDIA_CHANGE,
255   - GFP_KERNEL);
256 252 return events;
257 253 }
258 254