Skip to content

Commit

Permalink
ub: Convert to bdops->check_events()
Browse files Browse the repository at this point in the history
Convert from ->media_changed() to ->check_events().

ub buffers media changed state and clears it on revalidation.  It will
behave correctly with kernel event polling.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
  • Loading branch information
Tejun Heo committed Mar 9, 2011
1 parent 4bbde77 commit aaa7c01
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/block/ub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,8 @@ static int ub_bd_revalidate(struct gendisk *disk)
*
* The return code is bool!
*/
static int ub_bd_media_changed(struct gendisk *disk)
static unsigned int ub_bd_check_events(struct gendisk *disk,
unsigned int clearing)
{
struct ub_lun *lun = disk->private_data;

Expand All @@ -1806,18 +1807,18 @@ static int ub_bd_media_changed(struct gendisk *disk)
*/
if (ub_sync_tur(lun->udev, lun) != 0) {
lun->changed = 1;
return 1;
return DISK_EVENT_MEDIA_CHANGE;
}

return lun->changed;
return lun->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
}

static const struct block_device_operations ub_bd_fops = {
.owner = THIS_MODULE,
.open = ub_bd_unlocked_open,
.release = ub_bd_release,
.ioctl = ub_bd_ioctl,
.media_changed = ub_bd_media_changed,
.check_events = ub_bd_check_events,
.revalidate_disk = ub_bd_revalidate,
};

Expand Down Expand Up @@ -2333,6 +2334,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
disk->major = UB_MAJOR;
disk->first_minor = lun->id * UB_PARTS_PER_LUN;
disk->fops = &ub_bd_fops;
disk->events = DISK_EVENT_MEDIA_CHANGE;
disk->private_data = lun;
disk->driverfs_dev = &sc->intf->dev;

Expand Down

0 comments on commit aaa7c01

Please sign in to comment.