Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5610521 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: unify sysfs size node handling 



Now that capacity and __dev are moved to part0, part0 and others can
share the same method.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 548b10eb

block/genhd.c

+1 −9
Original line number Diff line number Diff line
@@ -760,14 +760,6 @@ static ssize_t disk_ro_show(struct device *dev, 
	return sprintf(buf, "%d\n", disk->policy ? 1 : 0);

}



static ssize_t disk_size_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct gendisk *disk = dev_to_disk(dev);



	return sprintf(buf, "%llu\n", (unsigned long long)get_capacity(disk));

}



static ssize_t disk_capability_show(struct device *dev,

				    struct device_attribute *attr, char *buf)

{
@@ -835,7 +827,7 @@ static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL); 
static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL);

static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL);

static DEVICE_ATTR(ro, S_IRUGO, disk_ro_show, NULL);

static DEVICE_ATTR(size, S_IRUGO, disk_size_show, NULL);

static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL);

static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL);

static DEVICE_ATTR(stat, S_IRUGO, disk_stat_show, NULL);

#ifdef CONFIG_FAIL_MAKE_REQUEST

fs/partitions/check.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static ssize_t part_start_show(struct device *dev, 
	return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);

}



static ssize_t part_size_show(struct device *dev,

ssize_t part_size_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

include/linux/genhd.h

+3 −0
Original line number Diff line number Diff line
@@ -591,6 +591,9 @@ extern void blk_register_region(dev_t devt, unsigned long range, 
			void *data);

extern void blk_unregister_region(dev_t devt, unsigned long range);



extern ssize_t part_size_show(struct device *dev,

			      struct device_attribute *attr, char *buf);



#else /* CONFIG_BLOCK */



static inline void printk_all_partitions(void) { }