diff options
Diffstat (limited to 'block/genhd.c')
-rw-r--r-- | block/genhd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/block/genhd.c b/block/genhd.c index 36b9f1bdd91f..c70db35076a0 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -760,14 +760,6 @@ static ssize_t disk_ro_show(struct device *dev, | |||
760 | return sprintf(buf, "%d\n", disk->policy ? 1 : 0); | 760 | return sprintf(buf, "%d\n", disk->policy ? 1 : 0); |
761 | } | 761 | } |
762 | 762 | ||
763 | static ssize_t disk_size_show(struct device *dev, | ||
764 | struct device_attribute *attr, char *buf) | ||
765 | { | ||
766 | struct gendisk *disk = dev_to_disk(dev); | ||
767 | |||
768 | return sprintf(buf, "%llu\n", (unsigned long long)get_capacity(disk)); | ||
769 | } | ||
770 | |||
771 | static ssize_t disk_capability_show(struct device *dev, | 763 | static ssize_t disk_capability_show(struct device *dev, |
772 | struct device_attribute *attr, char *buf) | 764 | struct device_attribute *attr, char *buf) |
773 | { | 765 | { |
@@ -835,7 +827,7 @@ static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL); | |||
835 | static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL); | 827 | static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL); |
836 | static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL); | 828 | static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL); |
837 | static DEVICE_ATTR(ro, S_IRUGO, disk_ro_show, NULL); | 829 | static DEVICE_ATTR(ro, S_IRUGO, disk_ro_show, NULL); |
838 | static DEVICE_ATTR(size, S_IRUGO, disk_size_show, NULL); | 830 | static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL); |
839 | static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL); | 831 | static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL); |
840 | static DEVICE_ATTR(stat, S_IRUGO, disk_stat_show, NULL); | 832 | static DEVICE_ATTR(stat, S_IRUGO, disk_stat_show, NULL); |
841 | #ifdef CONFIG_FAIL_MAKE_REQUEST | 833 | #ifdef CONFIG_FAIL_MAKE_REQUEST |