drivers/base: use %*pb[l] to print bitmaps including cpumasks and nodemasks

htejun · torvalds · commit f799b1a7fbd2 · 2015-02-13T21:21:38.000-08:00
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.

* Line termination only requires one extra space at the end of the
  buffer.  Use PAGE_SIZE - 1 instead of PAGE_SIZE - 2 when formatting.

Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
Acked-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
@@ -245,7 +245,7 @@ static ssize_t print_cpus_offline(struct device *dev,
 	if (!alloc_cpumask_var(&offline, GFP_KERNEL))
 		return -ENOMEM;
 	cpumask_andnot(offline, cpu_possible_mask, cpu_online_mask);
-	n = cpulist_scnprintf(buf, len, offline);
+	n = scnprintf(buf, len, "%*pbl", cpumask_pr_args(offline));
 	free_cpumask_var(offline);
 
 	/* display offline cpus >= nr_cpu_ids */
diff --git a/drivers/base/node.c b/drivers/base/node.c
@@ -605,7 +605,8 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
 {
 	int n;
 
-	n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]);
+	n = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+		      nodemask_pr_args(&node_states[state]));
 	buf[n++] = '\n';
 	buf[n] = '\0';
 	return n;

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,8 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)`
`605`	`605`	`{`
`606`	`606`	`int n;`
`607`	`607`
`608`		`- n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]);`
	`608`	`+ n = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",`
	`609`	`+ nodemask_pr_args(&node_states[state]));`
`609`	`610`	`buf[n++] = '\n';`
`610`	`611`	`buf[n] = '\0';`
`611`	`612`	`return n;`