diff options
author | 2020-09-08 16:53:35 +0200 | |
---|---|---|
committer | 2020-09-10 09:32:31 -0600 | |
commit | 3dcbad297b9976394190ee40913b53e50e9c83f2 (patch) | |
tree | fdc37e6c05e92b87b58ac3791fbe59b9c1392fb8 | |
parent | swim: simplify media change handling (diff) | |
download | linux-3dcbad297b9976394190ee40913b53e50e9c83f2.tar.gz linux-3dcbad297b9976394190ee40913b53e50e9c83f2.tar.bz2 linux-3dcbad297b9976394190ee40913b53e50e9c83f2.zip |
swim3: use bdev_check_media_changed
Switch to use bdev_check_media_changed instead of check_disk_change and
call floppy_revalidate manually. Given that floppy_revalidate only
deals with media change events, 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>
-rw-r--r-- | drivers/block/swim3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index aa77eb5fb7de..c2d922d125e2 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -945,7 +945,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) if (err == 0 && (mode & FMODE_NDELAY) == 0 && (mode & (FMODE_READ|FMODE_WRITE))) { - check_disk_change(bdev); + if (bdev_check_media_change(bdev)) + floppy_revalidate(bdev->bd_disk); if (fs->ejected) err = -ENXIO; } @@ -1055,7 +1056,6 @@ static const struct block_device_operations floppy_fops = { .release = floppy_release, .ioctl = floppy_ioctl, .check_events = floppy_check_events, - .revalidate_disk= floppy_revalidate, }; static const struct blk_mq_ops swim3_mq_ops = { |