diff options
author | Tejun Heo <tj@kernel.org> | 2015-02-13 17:37:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-14 00:21:38 -0500 |
commit | c7badc90178b89c49e3852a002024d26cef5f070 (patch) | |
tree | 85a8a8e8c359e640e9a615b5c37f305888f5eba6 | |
parent | 0b480037e8eb7928bdb760717693485bb3b728e4 (diff) |
scsi: use %*pb[l] to print bitmaps including cpumasks and nodemasks
printk and friends can now format bitmaps using '%*pb[l]'. cpumask
and nodemask also provide cpumask_pr_args() and nodemask_pr_args()
respectively which can be used to generate the two printf arguments
necessary to format the specified cpu/nodemask.
* map_show()'s return value is too high by one and the function could
modify beyond the end of the buffer when the formatted text is long
enough.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/scsi/scsi_debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 113232135d27..1f8e2dc9c616 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
@@ -4658,10 +4658,10 @@ static ssize_t map_show(struct device_driver *ddp, char *buf) | |||
4658 | return scnprintf(buf, PAGE_SIZE, "0-%u\n", | 4658 | return scnprintf(buf, PAGE_SIZE, "0-%u\n", |
4659 | sdebug_store_sectors); | 4659 | sdebug_store_sectors); |
4660 | 4660 | ||
4661 | count = bitmap_scnlistprintf(buf, PAGE_SIZE, map_storep, map_size); | 4661 | count = scnprintf(buf, PAGE_SIZE - 1, "%*pbl", |
4662 | 4662 | (int)map_size, map_storep); | |
4663 | buf[count++] = '\n'; | 4663 | buf[count++] = '\n'; |
4664 | buf[count++] = 0; | 4664 | buf[count] = '\0'; |
4665 | 4665 | ||
4666 | return count; | 4666 | return count; |
4667 | } | 4667 | } |