Commit f6edde9c authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds

mm: slub: fix format mismatches in slab_err() callers

Adding __printf(3, 4) to slab_err exposed following:

  mm/slub.c: In function `check_slab':
  mm/slub.c:852:4: warning: format `%u' expects argument of type `unsigned int', but argument 4 has type `const char *' [-Wformat=]
      s->name, page->objects, maxobj);
      ^
  mm/slub.c:852:4: warning: too many arguments for format [-Wformat-extra-args]
  mm/slub.c:857:4: warning: format `%u' expects argument of type `unsigned int', but argument 4 has type `const char *' [-Wformat=]
      s->name, page->inuse, page->objects);
      ^
  mm/slub.c:857:4: warning: too many arguments for format [-Wformat-extra-args]

  mm/slub.c: In function `on_freelist':
  mm/slub.c:905:4: warning: format `%d' expects argument of type `int', but argument 5 has type `long unsigned int' [-Wformat=]
      "should be %d", page->objects, max_objects);

Fix first two warnings by removing redundant s->name.
Fix the last by changing type of max_object from unsigned long to int.
Signed-off-by: default avatarAndrey Ryabinin <a.ryabinin@samsung.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54362057
...@@ -849,12 +849,12 @@ static int check_slab(struct kmem_cache *s, struct page *page) ...@@ -849,12 +849,12 @@ static int check_slab(struct kmem_cache *s, struct page *page)
maxobj = order_objects(compound_order(page), s->size, s->reserved); maxobj = order_objects(compound_order(page), s->size, s->reserved);
if (page->objects > maxobj) { if (page->objects > maxobj) {
slab_err(s, page, "objects %u > max %u", slab_err(s, page, "objects %u > max %u",
s->name, page->objects, maxobj); page->objects, maxobj);
return 0; return 0;
} }
if (page->inuse > page->objects) { if (page->inuse > page->objects) {
slab_err(s, page, "inuse %u > max %u", slab_err(s, page, "inuse %u > max %u",
s->name, page->inuse, page->objects); page->inuse, page->objects);
return 0; return 0;
} }
/* Slab_pad_check fixes things up after itself */ /* Slab_pad_check fixes things up after itself */
...@@ -871,7 +871,7 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search) ...@@ -871,7 +871,7 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search)
int nr = 0; int nr = 0;
void *fp; void *fp;
void *object = NULL; void *object = NULL;
unsigned long max_objects; int max_objects;
fp = page->freelist; fp = page->freelist;
while (fp && nr <= page->objects) { while (fp && nr <= page->objects) {
......
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