Commit 773008f6 authored by Martin Wilck's avatar Martin Wilck Committed by Jens Axboe
Browse files

Revert "block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers" 



This reverts commit 9fd097b1.

Instead of leaving disk->events completely empty, we now export the
supported events again, and tell the block layer not to forward events to
user space by not setting DISK_EVENT_FLAG_UEVENT. This allows the block
layer to distinguish between devices that for which events should be
handled in kernel only, and devices which don't support any meda change
events at all.

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3c12c8e9

drivers/block/amiflop.c

+1 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,7 @@ static int __init fd_probe_drives(void) 
		disk->major = FLOPPY_MAJOR;

		disk->first_minor = drive;

		disk->fops = &floppy_fops;

		disk->events = DISK_EVENT_MEDIA_CHANGE;

		sprintf(disk->disk_name, "fd%d", drive);

		disk->private_data = &unit[drive];

		set_capacity(disk, 880*2);

drivers/block/ataflop.c

+1 −0
Original line number Diff line number Diff line
@@ -2028,6 +2028,7 @@ static int __init atari_floppy_init (void) 
		unit[i].disk->first_minor = i;

		sprintf(unit[i].disk->disk_name, "fd%d", i);

		unit[i].disk->fops = &floppy_fops;

		unit[i].disk->events = DISK_EVENT_MEDIA_CHANGE;

		unit[i].disk->private_data = &unit[i];

		set_capacity(unit[i].disk, MAX_DISK_SIZE * 2);

		add_disk(unit[i].disk);

drivers/block/floppy.c

+1 −0
Original line number Diff line number Diff line
@@ -4540,6 +4540,7 @@ static int __init do_floppy_init(void) 
		disks[drive]->major = FLOPPY_MAJOR;

		disks[drive]->first_minor = TOMINOR(drive);

		disks[drive]->fops = &floppy_fops;

		disks[drive]->events = DISK_EVENT_MEDIA_CHANGE;

		sprintf(disks[drive]->disk_name, "fd%d", drive);



		timer_setup(&motor_off_timer[drive], motor_off_callback, 0);

drivers/block/paride/pcd.c

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ static void pcd_init_units(void) 
		strcpy(disk->disk_name, cd->name);	/* umm... */

		disk->fops = &pcd_bdops;

		disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;

		disk->events = DISK_EVENT_MEDIA_CHANGE;

	}

}

drivers/block/paride/pd.c

+1 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ static void pd_probe_drive(struct pd_unit *disk) 
	p->fops = &pd_fops;

	p->major = major;

	p->first_minor = (disk - pd) << PD_BITS;

	p->events = DISK_EVENT_MEDIA_CHANGE;

	disk->gd = p;

	p->private_data = disk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE