@@ -1619,6 +1619,19 @@ static void disk_events_workfn(struct work_struct *work)
kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp);
}
+int disk_events_set_poll_msecs(struct gendisk *disk, long intv)
+{
+ if (intv < 0 && intv != -1)
+ return -EINVAL;
+
+ disk_block_events(disk);
+ disk->ev->poll_msecs = intv;
+ __disk_unblock_events(disk, true);
+
+ return 0;
+}
+EXPORT_SYMBOL(disk_events_set_poll_msecs);
+
/*
* A disk events enabled device has the following sysfs nodes under
* its /sys/block/X/ directory.
@@ -1675,16 +1688,14 @@ static ssize_t disk_events_poll_msecs_store(struct device *dev,
{
struct gendisk *disk = dev_to_disk(dev);
long intv;
+ int ret;
if (!count || !sscanf(buf, "%ld", &intv))
return -EINVAL;
- if (intv < 0 && intv != -1)
- return -EINVAL;
-
- disk_block_events(disk);
- disk->ev->poll_msecs = intv;
- __disk_unblock_events(disk, true);
+ ret = disk_events_set_poll_msecs(disk, intv);
+ if (ret)
+ return ret;
return count;
}
@@ -862,6 +862,7 @@ static int sr_probe(struct device *dev)
dev_set_drvdata(dev, cd);
disk->flags |= GENHD_FL_REMOVABLE;
add_disk(disk);
+ disk_events_set_poll_msecs(disk, 2000);
sdev_printk(KERN_DEBUG, sdev,
"Attached scsi CD-ROM %s\n", cd->cdi.name);
@@ -418,6 +418,7 @@ extern void disk_block_events(struct gendisk *disk);
extern void disk_unblock_events(struct gendisk *disk);
extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
+extern int disk_events_set_poll_msecs(struct gendisk *disk, long intv);
/* drivers/char/random.c */
extern void add_disk_randomness(struct gendisk *disk);
Set the ODD's in kernel poll interval to 2s for the user in case the user is using an old distro on which udev will not set the system wide block parameter events_dfl_poll_msecs. Signed-off-by: Aaron Lu <aaron.lu@amd.com> --- block/genhd.c | 23 +++++++++++++++++------ drivers/scsi/sr.c | 1 + include/linux/genhd.h | 1 + 3 files changed, 19 insertions(+), 6 deletions(-)