Skip to content

Commit

Permalink
ide-cd: use bdev_check_media_changed
Browse files Browse the repository at this point in the history
Switch to use bdev_check_media_changed instead of check_disk_change and
call idecd_revalidate_disk manually.  Given that idecd_revalidate_disk
only re-reads the TOC, and we already do the same at probe time, the
extra call into ->revalidate_disk from bdev_disk_changed is not required
either, so stop wiring up the method.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Sep 10, 2020
1 parent faf0413 commit a22be69
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/ide/ide-cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ static DEFINE_MUTEX(ide_cd_mutex);
static DEFINE_MUTEX(idecd_ref_mutex);

static void ide_cd_release(struct device *);
static int idecd_revalidate_disk(struct gendisk *disk);

static struct cdrom_info *ide_cd_get(struct gendisk *disk)
{
Expand Down Expand Up @@ -1611,7 +1612,8 @@ static int idecd_open(struct block_device *bdev, fmode_t mode)
struct cdrom_info *info;
int rc = -ENXIO;

check_disk_change(bdev);
if (bdev_check_media_change(bdev))
idecd_revalidate_disk(bdev->bd_disk);

mutex_lock(&ide_cd_mutex);
info = ide_cd_get(bdev->bd_disk);
Expand Down Expand Up @@ -1770,7 +1772,6 @@ static const struct block_device_operations idecd_ops = {
.compat_ioctl = IS_ENABLED(CONFIG_COMPAT) ?
idecd_compat_ioctl : NULL,
.check_events = idecd_check_events,
.revalidate_disk = idecd_revalidate_disk
};

/* module options */
Expand Down

0 comments on commit a22be69

Please sign in to comment.