[PATCH 4/5] mm: shmem: Convert shmem_enabled_show to use sysfs_emit_at

From: Joe Perches
Date: Sun Nov 01 2020 - 15:13:14 EST


Update the function to use sysfs_emit_at while neatening the uses
of sprintf and overwriting the last space char with a newline.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
mm/shmem.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index 5009d783d954..294ba0017a0f 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -4024,7 +4024,7 @@ int __init shmem_init(void)

#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_SYSFS)
static ssize_t shmem_enabled_show(struct kobject *kobj,
- struct kobj_attribute *attr, char *buf)
+ struct kobj_attribute *attr, char *buf)
{
static const int values[] = {
SHMEM_HUGE_ALWAYS,
@@ -4034,16 +4034,19 @@ static ssize_t shmem_enabled_show(struct kobject *kobj,
SHMEM_HUGE_DENY,
SHMEM_HUGE_FORCE,
};
- int i, count;
-
- for (i = 0, count = 0; i < ARRAY_SIZE(values); i++) {
- const char *fmt = shmem_huge == values[i] ? "[%s] " : "%s ";
+ int len = 0;
+ int i;

- count += sprintf(buf + count, fmt,
- shmem_format_huge(values[i]));
+ for (i = 0; i < ARRAY_SIZE(values); i++) {
+ len += sysfs_emit_at(buf, len,
+ shmem_huge == values[i] ? "%s[%s]" : "%s%s",
+ i ? " " : "",
+ shmem_format_huge(values[i]));
}
- buf[count - 1] = '\n';
- return count;
+
+ len += sysfs_emit_at(buf, len, "\n");
+
+ return len;
}

static ssize_t shmem_enabled_store(struct kobject *kobj,
--
2.26.0