From c8fc336c8eb4f499a71aa345605f06f78caa86dc Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 25 Apr 2012 11:03:36 +1000 Subject: [PATCH] hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix s/scnprintf/snprintf/ Cc: "Aneesh Kumar K.V" Cc: Andrea Arcangeli Cc: Aneesh Kumar K.V Cc: Hillf Danton Cc: Johannes Weiner Cc: KAMEZAWA Hiroyuki Cc: Michal Hocko Signed-off-by: Andrew Morton --- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e27ba7f44db1..1c5e0969362e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4031,7 +4031,7 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft, BUG(); } - len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val); + len = snprintf(str, sizeof(str), "%llu\n", (unsigned long long)val); return simple_read_from_buffer(buf, nbytes, ppos, str, len); } /* @@ -5193,11 +5193,11 @@ static void mem_cgroup_destroy(struct cgroup *cont) static char *mem_fmt(char *buf, int size, unsigned long hsize) { if (hsize >= (1UL << 30)) - scnprintf(buf, size, "%luGB", hsize >> 30); + snprintf(buf, size, "%luGB", hsize >> 30); else if (hsize >= (1UL << 20)) - scnprintf(buf, size, "%luMB", hsize >> 20); + snprintf(buf, size, "%luMB", hsize >> 20); else - scnprintf(buf, size, "%luKB", hsize >> 10); + snprintf(buf, size, "%luKB", hsize >> 10); return buf; } -- 2.39.5