Commit 393a9572 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] old methods removal

	* old methods have no instances left; removed.
parent 901d4508
...@@ -527,12 +527,9 @@ int check_disk_change(struct block_device *bdev) ...@@ -527,12 +527,9 @@ int check_disk_change(struct block_device *bdev)
struct block_device_operations * bdops = bdev->bd_op; struct block_device_operations * bdops = bdev->bd_op;
kdev_t dev = to_kdev_t(bdev->bd_dev); kdev_t dev = to_kdev_t(bdev->bd_dev);
if (!bdops->media_changed) { if (!bdops->media_changed)
if (bdops->check_media_change == NULL) return 0;
return 0; if (!bdops->media_changed(bdev->bd_disk))
if (!bdops->check_media_change(dev))
return 0;
} else if (!bdops->media_changed(bdev->bd_disk))
return 0; return 0;
if (invalidate_device(dev, 0)) if (invalidate_device(dev, 0))
...@@ -540,8 +537,6 @@ int check_disk_change(struct block_device *bdev) ...@@ -540,8 +537,6 @@ int check_disk_change(struct block_device *bdev)
if (bdops->revalidate_disk) if (bdops->revalidate_disk)
bdops->revalidate_disk(bdev->bd_disk); bdops->revalidate_disk(bdev->bd_disk);
else if (bdops->revalidate)
bdops->revalidate(dev);
if (bdev->bd_disk->minors > 1) if (bdev->bd_disk->minors > 1)
bdev->bd_invalidated = 1; bdev->bd_invalidated = 1;
return 1; return 1;
......
...@@ -513,8 +513,6 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) ...@@ -513,8 +513,6 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
delete_partition(disk, p); delete_partition(disk, p);
if (bdev->bd_op->revalidate_disk) if (bdev->bd_op->revalidate_disk)
bdev->bd_op->revalidate_disk(disk); bdev->bd_op->revalidate_disk(disk);
else if (bdev->bd_op->revalidate)
bdev->bd_op->revalidate(dev);
if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) if (!get_capacity(disk) || !(state = check_partition(disk, bdev)))
return res; return res;
for (p = 1; p < state->limit; p++) { for (p = 1; p < state->limit; p++) {
......
...@@ -730,8 +730,6 @@ struct block_device_operations { ...@@ -730,8 +730,6 @@ struct block_device_operations {
int (*open) (struct inode *, struct file *); int (*open) (struct inode *, struct file *);
int (*release) (struct inode *, struct file *); int (*release) (struct inode *, struct file *);
int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long); int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
int (*check_media_change) (kdev_t);
int (*revalidate) (kdev_t);
int (*media_changed) (struct gendisk *); int (*media_changed) (struct gendisk *);
int (*revalidate_disk) (struct gendisk *); int (*revalidate_disk) (struct gendisk *);
struct module *owner; struct module *owner;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment