powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / block / blk-mq-sysfs.c

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 6f57a11..36a43ed 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -174,6 +174,11 @@ static ssize_t blk_mq_sysfs_rq_list_show(struct blk_mq_ctx *ctx, char *page)
        return ret;
 }
 
+static ssize_t blk_mq_hw_sysfs_poll_show(struct blk_mq_hw_ctx *hctx, char *page)
+{
+       return sprintf(page, "invoked=%lu, success=%lu\n", hctx->poll_invoked, hctx->poll_success);
+}
+
 static ssize_t blk_mq_hw_sysfs_queued_show(struct blk_mq_hw_ctx *hctx,
                                           char *page)
 {
@@ -226,20 +231,25 @@ static ssize_t blk_mq_hw_sysfs_active_show(struct blk_mq_hw_ctx *hctx, char *pag
 
 static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)
 {
+       const size_t size = PAGE_SIZE - 1;
        unsigned int i, first = 1;
-       ssize_t ret = 0;
+       int ret = 0, pos = 0;
 
        for_each_cpu(i, hctx->cpumask) {
                if (first)
-                       ret += sprintf(ret + page, "%u", i);
+                       ret = snprintf(pos + page, size - pos, "%u", i);
                else
-                       ret += sprintf(ret + page, ", %u", i);
+                       ret = snprintf(pos + page, size - pos, ", %u", i);
+
+               if (ret >= size - pos)
+                       break;
 
                first = 0;
+               pos += ret;
        }
 
-       ret += sprintf(ret + page, "\n");
-       return ret;
+       ret = snprintf(pos + page, size + 1 - pos, "\n");
+       return pos + ret;
 }
 
 static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_dispatched = {
@@ -295,6 +305,10 @@ static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_cpus = {
        .attr = {.name = "cpu_list", .mode = S_IRUGO },
        .show = blk_mq_hw_sysfs_cpus_show,
 };
+static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_poll = {
+       .attr = {.name = "io_poll", .mode = S_IRUGO },
+       .show = blk_mq_hw_sysfs_poll_show,
+};
 
 static struct attribute *default_hw_ctx_attrs[] = {
        &blk_mq_hw_sysfs_queued.attr,
@@ -304,6 +318,7 @@ static struct attribute *default_hw_ctx_attrs[] = {
        &blk_mq_hw_sysfs_tags.attr,
        &blk_mq_hw_sysfs_cpus.attr,
        &blk_mq_hw_sysfs_active.attr,
+       &blk_mq_hw_sysfs_poll.attr,
        NULL,
 };