linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Hugh Dickins <hughd@google.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] mm: shmem: Convert shmem_enabled_show to use sysfs_emit_at
Date: Sun,  1 Nov 2020 12:12:51 -0800	[thread overview]
Message-ID: <a06810c216a45e5f6f1b9f49fbe2f332ca3c8972.1604261483.git.joe@perches.com> (raw)
In-Reply-To: <cover.1604261483.git.joe@perches.com>

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@perches.com>
---
 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



  parent reply	other threads:[~2020-11-01 20:13 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-01 20:12 [PATCH 0/5] mm: Convert sysfs sprintf family to sysfs_emit Joe Perches
2020-11-01 20:12 ` [PATCH 1/5] mm: Use sysfs_emit for struct kobject * uses Joe Perches
2020-11-01 20:12 ` [PATCH 2/5] mm: huge_memory: Convert remaining use of sprintf to sysfs_emit and neatening Joe Perches
2020-11-01 20:12 ` [PATCH 3/5] mm:backing-dev: Use sysfs_emit in macro defining functions Joe Perches
2020-11-01 20:12 ` Joe Perches [this message]
2020-11-01 20:48   ` [PATCH 4/5] mm: shmem: Convert shmem_enabled_show to use sysfs_emit_at Matthew Wilcox
2020-11-01 21:04     ` Joe Perches
2020-11-01 21:19       ` Matthew Wilcox
2020-11-01 21:43         ` Joe Perches
2020-11-01 22:06           ` Matthew Wilcox
2020-11-01 22:08             ` Joe Perches
2020-11-01 22:13             ` Joe Perches
2020-11-01 22:14             ` Joe Perches
2020-11-02 13:33             ` Greg Kroah-Hartman
2020-11-02 14:08               ` Matthew Wilcox
2020-11-02 14:32                 ` Greg Kroah-Hartman
2020-11-02 14:40                   ` Matthew Wilcox
2020-11-02 17:01                     ` Joe Perches
2020-11-01 20:12 ` [PATCH 5/5] mm: slub: Convert sysfs sprintf family to sysfs_emit/sysfs_emit_at Joe Perches
2020-11-13 12:10   ` [mm] b6efe2fcc4: BUG:kernel_NULL_pointer_dereference,address kernel test robot
2020-11-13 16:13     ` Joe Perches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a06810c216a45e5f6f1b9f49fbe2f332ca3c8972.1604261483.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=hughd@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).