Commit 3ad5cee5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move sysfs methods shared by disks and partitions to genhd.c 



Move the sysfs _show methods that are used both on the full disk and
partition nodes to genhd.c instead of hiding them in the partitioning
code.  Also move the declaration for these methods to block/blk.h so
that we don't expose them to drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5cbd28e3

block/blk.h

+11 −0
Original line number Diff line number Diff line
@@ -214,6 +214,17 @@ static inline void elevator_exit(struct request_queue *q, 


struct hd_struct *__disk_get_part(struct gendisk *disk, int partno);



ssize_t part_size_show(struct device *dev, struct device_attribute *attr,

		char *buf);

ssize_t part_stat_show(struct device *dev, struct device_attribute *attr,

		char *buf);

ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,

		char *buf);

ssize_t part_fail_show(struct device *dev, struct device_attribute *attr,

		char *buf);

ssize_t part_fail_store(struct device *dev, struct device_attribute *attr,

		const char *buf, size_t count);



#ifdef CONFIG_FAIL_IO_TIMEOUT

int blk_should_fake_timeout(struct request_queue *);

ssize_t part_timeout_show(struct device *, struct device_attribute *, char *);

block/genhd.c

+79 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/module.h>

#include <linux/ctype.h>

#include <linux/fs.h>

#include <linux/genhd.h>

#include <linux/kdev_t.h>
@@ -1199,6 +1200,60 @@ static ssize_t disk_ro_show(struct device *dev, 
	return sprintf(buf, "%d\n", get_disk_ro(disk) ? 1 : 0);

}



ssize_t part_size_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);



	return sprintf(buf, "%llu\n",

		(unsigned long long)part_nr_sects_read(p));

}



ssize_t part_stat_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = part_to_disk(p)->queue;

	unsigned int inflight;



	inflight = part_in_flight(q, p);

	return sprintf(buf,

		"%8lu %8lu %8llu %8u "

		"%8lu %8lu %8llu %8u "

		"%8u %8u %8u "

		"%8lu %8lu %8llu %8u "

		"%8lu %8u"

		"\n",

		part_stat_read(p, ios[STAT_READ]),

		part_stat_read(p, merges[STAT_READ]),

		(unsigned long long)part_stat_read(p, sectors[STAT_READ]),

		(unsigned int)part_stat_read_msecs(p, STAT_READ),

		part_stat_read(p, ios[STAT_WRITE]),

		part_stat_read(p, merges[STAT_WRITE]),

		(unsigned long long)part_stat_read(p, sectors[STAT_WRITE]),

		(unsigned int)part_stat_read_msecs(p, STAT_WRITE),

		inflight,

		jiffies_to_msecs(part_stat_read(p, io_ticks)),

		jiffies_to_msecs(part_stat_read(p, time_in_queue)),

		part_stat_read(p, ios[STAT_DISCARD]),

		part_stat_read(p, merges[STAT_DISCARD]),

		(unsigned long long)part_stat_read(p, sectors[STAT_DISCARD]),

		(unsigned int)part_stat_read_msecs(p, STAT_DISCARD),

		part_stat_read(p, ios[STAT_FLUSH]),

		(unsigned int)part_stat_read_msecs(p, STAT_FLUSH));

}



ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,

			   char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = part_to_disk(p)->queue;

	unsigned int inflight[2];



	part_in_flight_rw(q, p, inflight);

	return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]);

}



static ssize_t disk_capability_show(struct device *dev,

				    struct device_attribute *attr, char *buf)

{
@@ -1237,10 +1292,33 @@ static DEVICE_ATTR(capability, 0444, disk_capability_show, NULL); 
static DEVICE_ATTR(stat, 0444, part_stat_show, NULL);

static DEVICE_ATTR(inflight, 0444, part_inflight_show, NULL);

static DEVICE_ATTR(badblocks, 0644, disk_badblocks_show, disk_badblocks_store);



#ifdef CONFIG_FAIL_MAKE_REQUEST

ssize_t part_fail_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);



	return sprintf(buf, "%d\n", p->make_it_fail);

}



ssize_t part_fail_store(struct device *dev,

			struct device_attribute *attr,

			const char *buf, size_t count)

{

	struct hd_struct *p = dev_to_part(dev);

	int i;



	if (count > 0 && sscanf(buf, "%d", &i) > 0)

		p->make_it_fail = (i == 0) ? 0 : 1;



	return count;

}



static struct device_attribute dev_attr_fail =

	__ATTR(make-it-fail, 0644, part_fail_show, part_fail_store);

#endif

#endif /* CONFIG_FAIL_MAKE_REQUEST */



#ifdef CONFIG_FAIL_IO_TIMEOUT

static struct device_attribute dev_attr_fail_timeout =

	__ATTR(io-timeout-fail, 0644, part_timeout_show, part_timeout_store);

block/partition-generic.c

+1 −75
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/ctype.h>

#include <linux/genhd.h>

#include <linux/blktrace_api.h>

#include "blk.h"



#include "partitions/check.h"
@@ -41,13 +42,6 @@ static ssize_t part_start_show(struct device *dev, 
	return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);

}



ssize_t part_size_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	return sprintf(buf, "%llu\n",(unsigned long long)part_nr_sects_read(p));

}



static ssize_t part_ro_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{
@@ -69,74 +63,6 @@ static ssize_t part_discard_alignment_show(struct device *dev, 
	return sprintf(buf, "%u\n", p->discard_alignment);

}



ssize_t part_stat_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = part_to_disk(p)->queue;

	unsigned int inflight;



	inflight = part_in_flight(q, p);

	return sprintf(buf,

		"%8lu %8lu %8llu %8u "

		"%8lu %8lu %8llu %8u "

		"%8u %8u %8u "

		"%8lu %8lu %8llu %8u "

		"%8lu %8u"

		"\n",

		part_stat_read(p, ios[STAT_READ]),

		part_stat_read(p, merges[STAT_READ]),

		(unsigned long long)part_stat_read(p, sectors[STAT_READ]),

		(unsigned int)part_stat_read_msecs(p, STAT_READ),

		part_stat_read(p, ios[STAT_WRITE]),

		part_stat_read(p, merges[STAT_WRITE]),

		(unsigned long long)part_stat_read(p, sectors[STAT_WRITE]),

		(unsigned int)part_stat_read_msecs(p, STAT_WRITE),

		inflight,

		jiffies_to_msecs(part_stat_read(p, io_ticks)),

		jiffies_to_msecs(part_stat_read(p, time_in_queue)),

		part_stat_read(p, ios[STAT_DISCARD]),

		part_stat_read(p, merges[STAT_DISCARD]),

		(unsigned long long)part_stat_read(p, sectors[STAT_DISCARD]),

		(unsigned int)part_stat_read_msecs(p, STAT_DISCARD),

		part_stat_read(p, ios[STAT_FLUSH]),

		(unsigned int)part_stat_read_msecs(p, STAT_FLUSH));

}



ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,

			   char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = part_to_disk(p)->queue;

	unsigned int inflight[2];



	part_in_flight_rw(q, p, inflight);

	return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]);

}



#ifdef CONFIG_FAIL_MAKE_REQUEST

ssize_t part_fail_show(struct device *dev,

		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);



	return sprintf(buf, "%d\n", p->make_it_fail);

}



ssize_t part_fail_store(struct device *dev,

			struct device_attribute *attr,

			const char *buf, size_t count)

{

	struct hd_struct *p = dev_to_part(dev);

	int i;



	if (count > 0 && sscanf(buf, "%d", &i) > 0)

		p->make_it_fail = (i == 0) ? 0 : 1;



	return count;

}

#endif



static DEVICE_ATTR(partition, 0444, part_partition_show, NULL);

static DEVICE_ATTR(start, 0444, part_start_show, NULL);

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

include/linux/genhd.h

+0 −14
Original line number Diff line number Diff line
@@ -706,20 +706,6 @@ 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);

extern ssize_t part_stat_show(struct device *dev,

			      struct device_attribute *attr, char *buf);

extern ssize_t part_inflight_show(struct device *dev,

			      struct device_attribute *attr, char *buf);

#ifdef CONFIG_FAIL_MAKE_REQUEST

extern ssize_t part_fail_show(struct device *dev,

			      struct device_attribute *attr, char *buf);

extern ssize_t part_fail_store(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t count);

#endif /* CONFIG_FAIL_MAKE_REQUEST */



#define alloc_disk_node(minors, node_id)				\

({									\

	static struct lock_class_key __key;				\

CRA Git | Maintained and supported by SUSTech CRA and CCSE