diff options
| author | Omar Sandoval <osandov@fb.com> | 2018-04-26 00:21:59 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-04-26 09:02:01 -0600 |
| commit | bf0ddaba65ddbb2715af97041da8e7a45b2d8628 (patch) | |
| tree | 42ecea860351829817753e8ce2c4205a8aaff8b1 /block/partition-generic.c | |
| parent | 6131837b1de66116459ef4413e26fdbc70d066dc (diff) | |
| download | lwn-bf0ddaba65ddbb2715af97041da8e7a45b2d8628.tar.gz lwn-bf0ddaba65ddbb2715af97041da8e7a45b2d8628.zip | |
blk-mq: fix sysfs inflight counter
When the blk-mq inflight implementation was added, /proc/diskstats was
converted to use it, but /sys/block/$dev/inflight was not. Fix it by
adding another helper to count in-flight requests by data direction.
Fixes: f299b7c7a9de ("blk-mq: provide internal in-flight variant")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/partition-generic.c')
| -rw-r--r-- | block/partition-generic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/block/partition-generic.c b/block/partition-generic.c index 08dabcd8b6ae..db57cced9b98 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -145,13 +145,15 @@ ssize_t part_stat_show(struct device *dev, jiffies_to_msecs(part_stat_read(p, time_in_queue))); } -ssize_t part_inflight_show(struct device *dev, - struct device_attribute *attr, char *buf) +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]; - return sprintf(buf, "%8u %8u\n", atomic_read(&p->in_flight[0]), - atomic_read(&p->in_flight[1])); + part_in_flight_rw(q, p, inflight); + return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]); } #ifdef CONFIG_FAIL_MAKE_REQUEST |