Commit 582d1212 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

slub: indicate slab_fix() uses printf formats

Ideally, slab_fix() would be marked with __printf and the format here
would not use \n as that's emitted by the slab_fix().  Make these changes.

Link: https://lkml.kernel.org/r/20210601182202.3011020-4-swboyd@chromium.orgSigned-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Petr Mladek <pmladek@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a88ef87
...@@ -692,6 +692,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) ...@@ -692,6 +692,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
va_end(args); va_end(args);
} }
__printf(2, 3)
static void slab_fix(struct kmem_cache *s, char *fmt, ...) static void slab_fix(struct kmem_cache *s, char *fmt, ...)
{ {
struct va_format vaf; struct va_format vaf;
...@@ -806,7 +807,7 @@ static void init_object(struct kmem_cache *s, void *object, u8 val) ...@@ -806,7 +807,7 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
static void restore_bytes(struct kmem_cache *s, char *message, u8 data, static void restore_bytes(struct kmem_cache *s, char *message, u8 data,
void *from, void *to) void *from, void *to)
{ {
slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x\n", message, from, to - 1, data); slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x", message, from, to - 1, data);
memset(from, data, to - from); memset(from, data, to - from);
} }
...@@ -1059,13 +1060,13 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search) ...@@ -1059,13 +1060,13 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search)
slab_err(s, page, "Wrong number of objects. Found %d but should be %d", slab_err(s, page, "Wrong number of objects. Found %d but should be %d",
page->objects, max_objects); page->objects, max_objects);
page->objects = max_objects; page->objects = max_objects;
slab_fix(s, "Number of objects adjusted."); slab_fix(s, "Number of objects adjusted");
} }
if (page->inuse != page->objects - nr) { if (page->inuse != page->objects - nr) {
slab_err(s, page, "Wrong object count. Counter is %d but counted were %d", slab_err(s, page, "Wrong object count. Counter is %d but counted were %d",
page->inuse, page->objects - nr); page->inuse, page->objects - nr);
page->inuse = page->objects - nr; page->inuse = page->objects - nr;
slab_fix(s, "Object count adjusted."); slab_fix(s, "Object count adjusted");
} }
return search == NULL; return search == NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment