Commit 22f97164 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

ataflop: use bdev_check_media_change 



Switch to use bdev_check_media_change 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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent acdfd443

drivers/block/ataflop.c

+4 −3
Original line number Diff line number Diff line
@@ -1732,7 +1732,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, 
		/* invalidate the buffer track to force a reread */

		BufferDrive = -1;

		set_bit(drive, &fake_change);

		check_disk_change(bdev);

		if (bdev_check_media_change(bdev))

			floppy_revalidate(bdev->bd_disk);

		return 0;

	default:

		return -EINVAL;
@@ -1909,7 +1910,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
		return 0;



	if (mode & (FMODE_READ|FMODE_WRITE)) {

		check_disk_change(bdev);

		if (bdev_check_media_change(bdev))

			floppy_revalidate(bdev->bd_disk);

		if (mode & FMODE_WRITE) {

			if (p->wpstat) {

				if (p->ref < 0)
@@ -1953,7 +1955,6 @@ static const struct block_device_operations floppy_fops = { 
	.release	= floppy_release,

	.ioctl		= fd_ioctl,

	.check_events	= floppy_check_events,

	.revalidate_disk= floppy_revalidate,

};



static const struct blk_mq_ops ataflop_mq_ops = {